Format miscellaneous files

Formatted client, avro and rabbitmq consumer files with Astyle.
This commit is contained in:
Markus Mäkelä
2017-01-17 13:53:48 +02:00
parent 3d92263cb3
commit 3205092540
5 changed files with 86 additions and 86 deletions

View File

@ -204,20 +204,20 @@ const char* maxavro_get_error_string(MAXAVRO_FILE *file)
{ {
switch (file->last_error) switch (file->last_error)
{ {
case MAXAVRO_ERR_IO: case MAXAVRO_ERR_IO:
return "MAXAVRO_ERR_IO"; return "MAXAVRO_ERR_IO";
case MAXAVRO_ERR_MEMORY: case MAXAVRO_ERR_MEMORY:
return "MAXAVRO_ERR_MEMORY"; return "MAXAVRO_ERR_MEMORY";
case MAXAVRO_ERR_VALUE_OVERFLOW: case MAXAVRO_ERR_VALUE_OVERFLOW:
return "MAXAVRO_ERR_VALUE_OVERFLOW"; return "MAXAVRO_ERR_VALUE_OVERFLOW";
case MAXAVRO_ERR_NONE: case MAXAVRO_ERR_NONE:
return "MAXAVRO_ERR_NONE"; return "MAXAVRO_ERR_NONE";
default: default:
return "UNKNOWN ERROR"; return "UNKNOWN ERROR";
} }
} }

View File

@ -35,7 +35,7 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
json_t* value = NULL; json_t* value = NULL;
switch (field->type) switch (field->type)
{ {
case MAXAVRO_TYPE_BOOL: case MAXAVRO_TYPE_BOOL:
{ {
int i = 0; int i = 0;
if (fread(&i, 1, 1, file->file) == 1) if (fread(&i, 1, 1, file->file) == 1)
@ -45,8 +45,8 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
} }
break; break;
case MAXAVRO_TYPE_INT: case MAXAVRO_TYPE_INT:
case MAXAVRO_TYPE_LONG: case MAXAVRO_TYPE_LONG:
{ {
uint64_t val = 0; uint64_t val = 0;
maxavro_read_integer(file, &val); maxavro_read_integer(file, &val);
@ -55,7 +55,7 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
} }
break; break;
case MAXAVRO_TYPE_ENUM: case MAXAVRO_TYPE_ENUM:
{ {
uint64_t val = 0; uint64_t val = 0;
maxavro_read_integer(file, &val); maxavro_read_integer(file, &val);
@ -73,8 +73,8 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
} }
break; break;
case MAXAVRO_TYPE_FLOAT: case MAXAVRO_TYPE_FLOAT:
case MAXAVRO_TYPE_DOUBLE: case MAXAVRO_TYPE_DOUBLE:
{ {
double d = 0; double d = 0;
maxavro_read_double(file, &d); maxavro_read_double(file, &d);
@ -82,8 +82,8 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
} }
break; break;
case MAXAVRO_TYPE_BYTES: case MAXAVRO_TYPE_BYTES:
case MAXAVRO_TYPE_STRING: case MAXAVRO_TYPE_STRING:
{ {
char *str = maxavro_read_string(file); char *str = maxavro_read_string(file);
if (str) if (str)
@ -94,9 +94,9 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
} }
break; break;
default: default:
MXS_ERROR("Unimplemented type: %d", field->type); MXS_ERROR("Unimplemented type: %d", field->type);
break; break;
} }
return value; return value;
} }
@ -105,33 +105,33 @@ static void skip_value(MAXAVRO_FILE *file, enum maxavro_value_type type)
{ {
switch (type) switch (type)
{ {
case MAXAVRO_TYPE_INT: case MAXAVRO_TYPE_INT:
case MAXAVRO_TYPE_LONG: case MAXAVRO_TYPE_LONG:
case MAXAVRO_TYPE_ENUM: case MAXAVRO_TYPE_ENUM:
{ {
uint64_t val = 0; uint64_t val = 0;
maxavro_read_integer(file, &val); maxavro_read_integer(file, &val);
} }
break; break;
case MAXAVRO_TYPE_FLOAT: case MAXAVRO_TYPE_FLOAT:
case MAXAVRO_TYPE_DOUBLE: case MAXAVRO_TYPE_DOUBLE:
{ {
double d = 0; double d = 0;
maxavro_read_double(file, &d); maxavro_read_double(file, &d);
} }
break; break;
case MAXAVRO_TYPE_BYTES: case MAXAVRO_TYPE_BYTES:
case MAXAVRO_TYPE_STRING: case MAXAVRO_TYPE_STRING:
{ {
maxavro_skip_string(file); maxavro_skip_string(file);
} }
break; break;
default: default:
MXS_ERROR("Unimplemented type: %d - %s", type, type_to_string(type)); MXS_ERROR("Unimplemented type: %d - %s", type, type_to_string(type));
break; break;
} }
} }

View File

@ -137,18 +137,18 @@ int main(int argc, char** argv)
{ {
switch (c) switch (c)
{ {
case 'v': case 'v':
verbose++; verbose++;
break; break;
case 'd': case 'd':
dump = true; dump = true;
break; break;
case 'f': case 'f':
seekto = strtol(optarg, NULL, 10); seekto = strtol(optarg, NULL, 10);
break; break;
case 'c': case 'c':
num_rows = strtol(optarg, NULL, 10); num_rows = strtol(optarg, NULL, 10);
break; break;
} }
} }

View File

@ -147,51 +147,51 @@ main(int argc, char **argv)
{ {
switch (c) switch (c)
{ {
case 'h': case 'h':
use_inet_socket = true; use_inet_socket = true;
hostname = strdup(optarg); hostname = strdup(optarg);
break; break;
case 'p': case 'p':
use_inet_socket = true; use_inet_socket = true;
// If password was not given, ask for it later // If password was not given, ask for it later
if (optarg != NULL) if (optarg != NULL)
{ {
passwd = strdup(optarg); passwd = strdup(optarg);
memset(optarg, '\0', strlen(optarg)); memset(optarg, '\0', strlen(optarg));
} }
break; break;
case 'P': case 'P':
use_inet_socket = true; use_inet_socket = true;
port = strdup(optarg); port = strdup(optarg);
break; break;
case 'u': case 'u':
use_inet_socket = true; use_inet_socket = true;
user = strdup(optarg); user = strdup(optarg);
break; break;
case 'S': case 'S':
use_unix_socket = true; use_unix_socket = true;
socket_path = strdup(optarg); socket_path = strdup(optarg);
break; break;
case 'v': case 'v':
PrintVersion(*argv); PrintVersion(*argv);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
case 'e': case 'e':
use_emacs = 1; use_emacs = 1;
break; break;
case 'i': case 'i':
use_emacs = 0; use_emacs = 0;
break; break;
case '?': case '?':
DoUsage(argv[0]); DoUsage(argv[0]);
exit(optopt ? EXIT_FAILURE : EXIT_SUCCESS); exit(optopt ? EXIT_FAILURE : EXIT_SUCCESS);
} }
} }

View File

@ -421,13 +421,13 @@ int main(int argc, char** argv)
{ {
switch (ch) switch (ch)
{ {
case 'c': case 'c':
cnfnlen = strlen(optarg); cnfnlen = strlen(optarg);
cnfpath = strdup(optarg); cnfpath = strdup(optarg);
break; break;
default: default:
break; break;
} }
} }