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/adaptor/dlt-adaptor-stdin.c | 114 ++++++++++++++++++-------------------- src/adaptor/dlt-adaptor-udp.c | 118 +++++++++++++++++++--------------------- 2 files changed, 108 insertions(+), 124 deletions(-) (limited to 'src/adaptor') diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c index aeca49b..e7817b1 100644 --- a/src/adaptor/dlt-adaptor-stdin.c +++ b/src/adaptor/dlt-adaptor-stdin.c @@ -22,7 +22,7 @@ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-adaptor-stdin.c -*/ + */ /******************************************************************************* ** ** @@ -63,7 +63,7 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ -*/ + */ #include #include @@ -82,7 +82,7 @@ DLT_DECLARE_CONTEXT(mycontext) -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { char str[MAXSTRLEN]; int opt; @@ -98,17 +98,15 @@ int main(int argc, char* argv[]) dlt_set_id(ctid, PS_DLT_CONTEXT); while ((opt = getopt(argc, argv, "a:c:bht:v:")) != -1) - { - switch (opt) - { + switch (opt) { case 'a': { - dlt_set_id(apid,optarg); + dlt_set_id(apid, optarg); break; } case 'c': { - dlt_set_id(ctid,optarg); + dlt_set_id(ctid, optarg); break; } case 'b': @@ -118,12 +116,12 @@ int main(int argc, char* argv[]) } case 't': { - timeout = atoi(optarg); - break; + timeout = atoi(optarg); + break; } case 'h': { - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-adaptor-stdin [options]\n"); printf("Adaptor for forwarding input from stdin to DLT daemon.\n"); @@ -133,49 +131,51 @@ int main(int argc, char* argv[]) printf(" -c ctid - Set context id to ctid (default: SINC)\n"); printf(" -b - Flush buffered logs before unregistering app\n"); printf(" -t timeout - Set timeout when sending messages at exit, in ms (Default: 10000 = 10sec)\n"); - printf(" -v verbosity level - Set verbosity level (Default: INFO, values: FATAL ERROR WARN INFO DEBUG VERBOSE)\n"); + printf( + " -v verbosity level - Set verbosity level (Default: INFO, values: FATAL ERROR WARN INFO DEBUG VERBOSE)\n"); printf(" -h - This help\n"); return 0; break; } case 'v': { - if(!strcmp(optarg, "FATAL")) - { - verbosity = DLT_LOG_FATAL; - break; - } - else if(!strcmp(optarg, "ERROR")) - { - verbosity = DLT_LOG_ERROR; - break; - } - else if(!strcmp(optarg, "WARN")) - { - verbosity = DLT_LOG_WARN; - break; - } - else if(!strcmp(optarg, "INFO")) - { - verbosity = DLT_LOG_INFO; - break; - } - else if(!strcmp(optarg, "DEBUG")) - { - verbosity = DLT_LOG_DEBUG; - break; - } - else if(!strcmp(optarg, "VERBOSE")) - { - verbosity = DLT_LOG_VERBOSE; - break; - } else - { - printf("Wrong verbosity level, setting to INFO. Accepted values are: FATAL ERROR WARN INFO DEBUG VERBOSE\n"); - verbosity = DLT_LOG_INFO; - break; - } - break; + if (!strcmp(optarg, "FATAL")) { + verbosity = DLT_LOG_FATAL; + break; + } + else if (!strcmp(optarg, "ERROR")) + { + verbosity = DLT_LOG_ERROR; + break; + } + else if (!strcmp(optarg, "WARN")) + { + verbosity = DLT_LOG_WARN; + break; + } + else if (!strcmp(optarg, "INFO")) + { + verbosity = DLT_LOG_INFO; + break; + } + else if (!strcmp(optarg, "DEBUG")) + { + verbosity = DLT_LOG_DEBUG; + break; + } + else if (!strcmp(optarg, "VERBOSE")) + { + verbosity = DLT_LOG_VERBOSE; + break; + } + else { + printf( + "Wrong verbosity level, setting to INFO. Accepted values are: FATAL ERROR WARN INFO DEBUG VERBOSE\n"); + verbosity = DLT_LOG_INFO; + break; + } + + break; } default: /* '?' */ { @@ -183,33 +183,23 @@ int main(int argc, char* argv[]) return -1; } } - } - DLT_REGISTER_APP(apid,PS_DLT_APP_DESC); + DLT_REGISTER_APP(apid, PS_DLT_APP_DESC); DLT_REGISTER_CONTEXT(mycontext, ctid, PS_DLT_CONTEXT_DESC); + if (timeout > -1) - { - dlt_set_resend_timeout_atexit(timeout); - } + dlt_set_resend_timeout_atexit(timeout); while (fgets(str, MAXSTRLEN, stdin)) - { - if (strcmp(str,"")!=0) - { + if (strcmp(str, "") != 0) DLT_LOG(mycontext, verbosity, DLT_STRING(str)); - } - } DLT_UNREGISTER_CONTEXT(mycontext); if (bflag == 1) - { DLT_UNREGISTER_APP_FLUSH_BUFFERED_LOGS(); - } else - { DLT_UNREGISTER_APP(); - } return 0; } diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c index 3322eab..05b33d2 100644 --- a/src/adaptor/dlt-adaptor-udp.c +++ b/src/adaptor/dlt-adaptor-udp.c @@ -22,7 +22,7 @@ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-adaptor-udp.c -*/ + */ /******************************************************************************* ** ** @@ -91,7 +91,7 @@ DLT_DECLARE_CONTEXT(mycontext) -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { int sock; int bytes_read; @@ -111,22 +111,20 @@ int main(int argc, char* argv[]) port = RCVPORT; while ((opt = getopt(argc, argv, "a:c:hp:v:")) != -1) - { - switch (opt) - { + switch (opt) { case 'a': { - dlt_set_id(apid,optarg); + dlt_set_id(apid, optarg); break; } case 'c': { - dlt_set_id(ctid,optarg); + dlt_set_id(ctid, optarg); break; } case 'h': { - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-adaptor-udp [options]\n"); printf("Adaptor for forwarding received UDP messages to DLT daemon.\n"); @@ -135,7 +133,8 @@ int main(int argc, char* argv[]) printf("-a apid - Set application id to apid (default: UDPA)\n"); printf("-c ctid - Set context id to ctid (default: UDPC)\n"); printf("-p - Set receive port number for UDP messages (default: %d) \n", port); - printf("-v verbosity level - Set verbosity level (Default: INFO, values: FATAL ERROR WARN INFO DEBUG VERBOSE)\n"); + printf( + "-v verbosity level - Set verbosity level (Default: INFO, values: FATAL ERROR WARN INFO DEBUG VERBOSE)\n"); printf("-h - This help\n"); return 0; break; @@ -147,55 +146,58 @@ int main(int argc, char* argv[]) } case 'v': { - if(!strcmp(optarg, "FATAL")) - { - verbosity = DLT_LOG_FATAL; - break; - } - else if(!strcmp(optarg, "ERROR")) - { - verbosity = DLT_LOG_ERROR; - break; - } - else if(!strcmp(optarg, "WARN")) - { - verbosity = DLT_LOG_WARN; - break; - } - else if(!strcmp(optarg, "INFO")) - { - verbosity = DLT_LOG_INFO; - break; - } - else if(!strcmp(optarg, "DEBUG")) - { - verbosity = DLT_LOG_DEBUG; - break; - } - else if(!strcmp(optarg, "VERBOSE")) - { - verbosity = DLT_LOG_VERBOSE; - break; - } else - { - printf("Wrong verbosity level, setting to INFO. Accepted values are: FATAL ERROR WARN INFO DEBUG VERBOSE\n"); - verbosity = DLT_LOG_INFO; - break; - } - break; + if (!strcmp(optarg, "FATAL")) { + verbosity = DLT_LOG_FATAL; + break; + } + else if (!strcmp(optarg, "ERROR")) + { + verbosity = DLT_LOG_ERROR; + break; + } + else if (!strcmp(optarg, "WARN")) + { + verbosity = DLT_LOG_WARN; + break; + } + else if (!strcmp(optarg, "INFO")) + { + verbosity = DLT_LOG_INFO; + break; + } + else if (!strcmp(optarg, "DEBUG")) + { + verbosity = DLT_LOG_DEBUG; + break; + } + else if (!strcmp(optarg, "VERBOSE")) + { + verbosity = DLT_LOG_VERBOSE; + break; + } + else { + printf( + "Wrong verbosity level, setting to INFO. Accepted values are: FATAL ERROR WARN INFO DEBUG VERBOSE\n"); + verbosity = DLT_LOG_INFO; + break; + } + + break; } default: /* '?' */ { fprintf(stderr, "Unknown option '%c'\n", optopt); exit(3); - return 3;//for parasoft + return 3;/*for parasoft */ } } - } + #ifdef DLT_USE_IPv6 + if ((sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) #else + if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) #endif { @@ -212,34 +214,28 @@ int main(int argc, char* argv[]) server_addr.sin_addr.s_addr = INADDR_ANY; bzero(&(server_addr.sin_zero), 8); - if (bind(sock, (struct sockaddr *)&server_addr, - sizeof(struct sockaddr)) == -1) - { + sizeof(struct sockaddr)) == -1) { perror("Bind"); return -1; } addr_len = sizeof(struct sockaddr); - DLT_REGISTER_APP(apid,PU_DLT_APP_DESC); - DLT_REGISTER_CONTEXT(mycontext,ctid,PU_DLT_CONTEXT_DESC); + DLT_REGISTER_APP(apid, PU_DLT_APP_DESC); + DLT_REGISTER_CONTEXT(mycontext, ctid, PU_DLT_CONTEXT_DESC); - while (1) - { + while (1) { bytes_read = 0; bytes_read = recvfrom(sock, recv_data, MAXSTRLEN, 0, (struct sockaddr *)&client_addr, &addr_len); - if (bytes_read == -1) - { - if (errno == EINTR) - { + if (bytes_read == -1) { + if (errno == EINTR) { continue; } - else - { + else { DLT_UNREGISTER_CONTEXT(mycontext); DLT_UNREGISTER_APP(); exit(1); @@ -249,9 +245,7 @@ int main(int argc, char* argv[]) recv_data[bytes_read] = '\0'; if (bytes_read != 0) - { DLT_LOG(mycontext, verbosity, DLT_STRING(recv_data)); - } } DLT_UNREGISTER_CONTEXT(mycontext); -- cgit v1.2.1