From dca8ab254aa0a687c32009079d85e4d8f960b213 Mon Sep 17 00:00:00 2001 From: Christoph Lipka Date: Thu, 20 Dec 2018 14:58:19 +0100 Subject: Code beautification using uncrustify Signed-off-by: Christoph Lipka --- src/dbus/dlt-dbus-options.c | 182 +++++++++++++++++++++----------------------- 1 file changed, 86 insertions(+), 96 deletions(-) (limited to 'src/dbus/dlt-dbus-options.c') diff --git a/src/dbus/dlt-dbus-options.c b/src/dbus/dlt-dbus-options.c index 27bf4f4..fc5b584 100644 --- a/src/dbus/dlt-dbus-options.c +++ b/src/dbus/dlt-dbus-options.c @@ -37,7 +37,7 @@ void usage(char *prog_name) { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: %s [options]\n", prog_name); printf("Application to forward dbus messages to DLT.\n"); @@ -57,10 +57,10 @@ void usage(char *prog_name) */ void init_cli_options(DltDBusCliOptions *options) { - options->ConfigurationFileName = DEFAULT_CONF_FILE; - options->ApplicationId = 0; - options->BusType = 0; - options->Daemonize = 0; + options->ConfigurationFileName = DEFAULT_CONF_FILE; + options->ApplicationId = 0; + options->BusType = 0; + options->Daemonize = 0; } /** @@ -71,49 +71,48 @@ int read_command_line(DltDBusCliOptions *options, int argc, char *argv[]) init_cli_options(options); int opt; - while((opt = getopt(argc, argv, "c:b:a:hd")) != -1) - { - switch(opt) { - case 'd': - { - options->Daemonize = 1; - break; - } - case 'b': - { - options->BusType = malloc(strlen(optarg)+1); - MALLOC_ASSERT(options->BusType); - strcpy(options->BusType, optarg); /* strcpy unritical here, because size matches exactly the size to be copied */ - break; - } - case 'a': - { - options->ApplicationId = malloc(strlen(optarg)+1); - MALLOC_ASSERT(options->ApplicationId); - strcpy(options->ApplicationId, optarg); /* strcpy unritical here, because size matches exactly the size to be copied */ - break; - } - case 'c': - { - options->ConfigurationFileName = malloc(strlen(optarg)+1); - MALLOC_ASSERT(options->ConfigurationFileName); - strcpy(options->ConfigurationFileName, optarg); /* strcpy unritical here, because size matches exactly the size to be copied */ - break; - } - case 'h': - { - usage(argv[0]); - exit(0); - return -1;//for parasoft - } - default: - { - fprintf(stderr, "Unknown option '%c'\n", optopt); - usage(argv[0]); - return -1; - } + while ((opt = getopt(argc, argv, "c:b:a:hd")) != -1) + switch (opt) { + case 'd': + { + options->Daemonize = 1; + break; } - } + case 'b': + { + options->BusType = malloc(strlen(optarg) + 1); + MALLOC_ASSERT(options->BusType); + strcpy(options->BusType, optarg); /* strcpy unritical here, because size matches exactly the size to be copied */ + break; + } + case 'a': + { + options->ApplicationId = malloc(strlen(optarg) + 1); + MALLOC_ASSERT(options->ApplicationId); + strcpy(options->ApplicationId, optarg); /* strcpy unritical here, because size matches exactly the size to be copied */ + break; + } + case 'c': + { + options->ConfigurationFileName = malloc(strlen(optarg) + 1); + MALLOC_ASSERT(options->ConfigurationFileName); + strcpy(options->ConfigurationFileName, optarg); /* strcpy unritical here, because size matches exactly the size to be copied */ + break; + } + case 'h': + { + usage(argv[0]); + exit(0); + return -1; /*for parasoft */ + } + default: + { + fprintf(stderr, "Unknown option '%c'\n", optopt); + usage(argv[0]); + return -1; + } + } + return 0; } @@ -122,13 +121,13 @@ int read_command_line(DltDBusCliOptions *options, int argc, char *argv[]) */ void init_configuration(DltDBusConfiguration *config) { - // Common - config->ApplicationId = "IPC0"; + /* Common */ + config->ApplicationId = "IPC0"; - // DBus - config->DBus.ContextId = "ALL"; - config->DBus.BusType = 0; - config->DBus.FilterCount = 0; + /* DBus */ + config->DBus.ContextId = "ALL"; + config->DBus.BusType = 0; + config->DBus.FilterCount = 0; } @@ -140,14 +139,13 @@ int read_configuration_file(DltDBusConfiguration *config, char *file_name) FILE *file; char *line, *token, *value, *filter, *pch; int ret = 0; - char *filterBegin,*filterEnd; + char *filterBegin, *filterEnd; init_configuration(config); file = fopen(file_name, "r"); - if(file == NULL) - { + if (file == NULL) { fprintf(stderr, "dlt-dbus-options, could not open configuration file.\n"); return -1; } @@ -162,78 +160,69 @@ int read_configuration_file(DltDBusConfiguration *config, char *file_name) MALLOC_ASSERT(value); MALLOC_ASSERT(filter); - while(fgets(line, MAX_LINE, file) != NULL) - { + while (fgets(line, MAX_LINE, file) != NULL) { token[0] = 0; value[0] = 0; filter[0] = 0; - filterBegin = strchr(line,'='); - filterEnd = strpbrk (line,"\r\n"); + filterBegin = strchr(line, '='); + filterEnd = strpbrk (line, "\r\n"); - if(filterBegin) - { - if(filterEnd && (filterEnd>filterBegin)) - { - strncpy(filter,filterBegin+1,filterEnd-filterBegin-1); - filter[filterEnd-filterBegin-1]=0; + if (filterBegin) { + if (filterEnd && (filterEnd > filterBegin)) { + strncpy(filter, filterBegin + 1, filterEnd - filterBegin - 1); + filter[filterEnd - filterBegin - 1] = 0; } - else - { - strcpy(filter,filterBegin+1); + else { + strcpy(filter, filterBegin + 1); } } pch = strtok (line, " =\r\n"); - while(pch != NULL) - { - if(pch[0] == '#') + + while (pch != NULL) { + if (pch[0] == '#') break; - if(token[0] == 0) - { - strncpy(token, pch, MAX_LINE-1); - token[MAX_LINE-1]=0; + if (token[0] == 0) { + strncpy(token, pch, MAX_LINE - 1); + token[MAX_LINE - 1] = 0; } - else - { + else { strncpy(value, pch, MAX_LINE); - value[MAX_LINE-1]=0; + value[MAX_LINE - 1] = 0; break; } pch = strtok (NULL, " =\r\n"); } - if(token[0] && value[0]) - { - // Common - if(strcmp(token, "ApplicationId") == 0) - { - config->ApplicationId = malloc(strlen(value)+1); + if (token[0] && value[0]) { + /* Common */ + if (strcmp(token, "ApplicationId") == 0) { + config->ApplicationId = malloc(strlen(value) + 1); MALLOC_ASSERT(config->ApplicationId); strcpy(config->ApplicationId, value); /* strcpy unritical here, because size matches exactly the size to be copied */ } - // ContextId - else if(strcmp(token, "ContextId") == 0) + /* ContextId */ + else if (strcmp(token, "ContextId") == 0) { - config->DBus.ContextId = malloc(strlen(value)+1); + config->DBus.ContextId = malloc(strlen(value) + 1); MALLOC_ASSERT(config->DBus.ContextId); strcpy(config->DBus.ContextId, value); /* strcpy unritical here, because size matches exactly the size to be copied */ } - // BusType - else if(strcmp(token, "BusType") == 0) + /* BusType */ + else if (strcmp(token, "BusType") == 0) { - config->DBus.BusType = malloc(strlen(value)+1); + config->DBus.BusType = malloc(strlen(value) + 1); MALLOC_ASSERT(config->DBus.BusType); strcpy(config->DBus.BusType, value); /* strcpy unritical here, because size matches exactly the size to be copied */ } - // BusType - else if(strcmp(token, "FilterMatch") == 0) + /* BusType */ + else if (strcmp(token, "FilterMatch") == 0) { - if(config->DBus.FilterCountDBus.FilterMatch[config->DBus.FilterCount]= malloc(strlen(filter)+1); + if (config->DBus.FilterCount < DLT_DBUS_FILTER_MAX) { + config->DBus.FilterMatch[config->DBus.FilterCount] = malloc(strlen(filter) + 1); MALLOC_ASSERT(config->DBus.FilterMatch[config->DBus.FilterCount]); strcpy(config->DBus.FilterMatch[config->DBus.FilterCount], filter); config->DBus.FilterCount++; @@ -241,6 +230,7 @@ int read_configuration_file(DltDBusConfiguration *config, char *file_name) } } } + fclose(file); free(value); free(token); -- cgit v1.2.1