diff options
author | Christoph Lipka <clipka@de.adit-jv.com> | 2018-12-20 14:58:19 +0100 |
---|---|---|
committer | Christoph Lipka <clipka@de.adit-jv.com> | 2018-12-21 10:23:41 +0100 |
commit | dca8ab254aa0a687c32009079d85e4d8f960b213 (patch) | |
tree | e63b6a552fd9f61873892110a56a89ef354864cd /src/console/dlt-convert.c | |
parent | 0d0c74640c8b792db37cb9f884f89f7561ea551f (diff) | |
download | DLT-daemon-dca8ab254aa0a687c32009079d85e4d8f960b213.tar.gz |
Code beautification using uncrustify
Signed-off-by: Christoph Lipka <clipka@de.adit-jv.com>
Diffstat (limited to 'src/console/dlt-convert.c')
-rw-r--r-- | src/console/dlt-convert.c | 312 |
1 files changed, 140 insertions, 172 deletions
diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c index 8c5c901..8c71684 100644 --- a/src/console/dlt-convert.c +++ b/src/console/dlt-convert.c @@ -22,7 +22,7 @@ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-convert.cpp -*/ + */ /******************************************************************************* ** ** @@ -72,8 +72,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <stdio.h> #include <stdlib.h> @@ -97,7 +97,7 @@ void usage() { char version[DLT_CONVERT_TEXTBUFSIZE]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-convert [options] [commands] file1 [file2]\n"); printf("Read DLT files, print DLT messages as ASCII and store the messages again.\n"); @@ -124,7 +124,7 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { int vflag = 0; int cflag = 0; @@ -141,271 +141,239 @@ int main(int argc, char* argv[]) int index; int c; - DltFile file; - DltFilter filter; + DltFile file; + DltFilter filter; - int ohandle=-1; + int ohandle = -1; - int num, begin, end; + int num, begin, end; - char text[DLT_CONVERT_TEXTBUFSIZE]; + char text[DLT_CONVERT_TEXTBUFSIZE]; - struct iovec iov[2]; + struct iovec iov[2]; int bytes_written; opterr = 0; while ((c = getopt (argc, argv, "vcashxmwf:b:e:o:")) != -1) - switch (c) - { + switch (c) { case 'v': - { - vflag = 1; - break; - } + { + vflag = 1; + break; + } case 'c': - { - cflag = 1; - break; - } + { + cflag = 1; + break; + } case 'a': - { - aflag = 1; - break; - } + { + aflag = 1; + break; + } case 's': - { - sflag = 1; - break; - } + { + sflag = 1; + break; + } case 'x': - { - xflag = 1; - break; - } + { + xflag = 1; + break; + } case 'm': - { - mflag = 1; - break; - } + { + mflag = 1; + break; + } case 'w': - { - wflag = 1; - break; - } + { + wflag = 1; + break; + } case 'h': - { - usage(); - return -1; - } + { + usage(); + return -1; + } case 'f': - { - fvalue = optarg; - break; - } + { + fvalue = optarg; + break; + } case 'b': - { - bvalue = optarg; - break; - } + { + bvalue = optarg; + break; + } case 'e': - { - evalue = optarg; - break; - } + { + evalue = optarg; + break; + } case 'o': - { - ovalue = optarg; - break; - } + { + ovalue = optarg; + break; + } case '?': - { - if (optopt == 'f' || optopt == 'b' || optopt == 'e' || optopt == 'o') - { - fprintf (stderr, "Option -%c requires an argument.\n", optopt); - } - else if (isprint (optopt)) - { - fprintf (stderr, "Unknown option `-%c'.\n", optopt); - } - else - { - fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt); - } - /* unknown or wrong option used, show usage information and terminate */ - usage(); - return -1; - } + { + if ((optopt == 'f') || (optopt == 'b') || (optopt == 'e') || (optopt == 'o')) + fprintf (stderr, "Option -%c requires an argument.\n", optopt); + else if (isprint (optopt)) + fprintf (stderr, "Unknown option `-%c'.\n", optopt); + else + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + + /* unknown or wrong option used, show usage information and terminate */ + usage(); + return -1; + } default: - { - abort(); - return -1;//for parasoft - } + { + abort(); + return -1; /*for parasoft */ + } } /* initialise structure to use DLT file */ - dlt_file_init(&file,vflag); + dlt_file_init(&file, vflag); /* first parse filter file if filter parameter is used */ - if (fvalue) - { - if (dlt_filter_load(&filter,fvalue,vflag) < DLT_RETURN_OK) - { - dlt_file_free(&file,vflag); + if (fvalue) { + if (dlt_filter_load(&filter, fvalue, vflag) < DLT_RETURN_OK) { + dlt_file_free(&file, vflag); return -1; } - dlt_file_set_filter(&file,&filter,vflag); + dlt_file_set_filter(&file, &filter, vflag); } - if (ovalue) - { - ohandle = open(ovalue,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */ - if (ohandle == -1) - { - dlt_file_free(&file,vflag); - fprintf(stderr,"ERROR: Output file %s cannot be opened!\n",ovalue); + if (ovalue) { + ohandle = open(ovalue, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */ + + if (ohandle == -1) { + dlt_file_free(&file, vflag); + fprintf(stderr, "ERROR: Output file %s cannot be opened!\n", ovalue); return -1; } - } - for (index = optind; index < argc; index++) - { + for (index = optind; index < argc; index++) { /* load, analyse data file and create index list */ - if (dlt_file_open(&file,argv[index],vflag) >= DLT_RETURN_OK) - { - while (dlt_file_read(&file,vflag) >= DLT_RETURN_OK) - { - } + if (dlt_file_open(&file, argv[index], vflag) >= DLT_RETURN_OK) { + while (dlt_file_read(&file, vflag) >= DLT_RETURN_OK) {} } - if (aflag || sflag || xflag || mflag || ovalue) - { + if (aflag || sflag || xflag || mflag || ovalue) { if (bvalue) - { begin = atoi(bvalue); - } - else - { + else begin = 0; - } - if (evalue && (wflag==0)) - { + if (evalue && (wflag == 0)) end = atoi(evalue); - } - else - { - end = file.counter-1; - } - - if (begin<0 || begin>=file.counter) - { - fprintf(stderr,"ERROR: Selected first message %d is out of range!\n",begin); + else + end = file.counter - 1; + + if ((begin < 0) || (begin >= file.counter)) { + fprintf(stderr, "ERROR: Selected first message %d is out of range!\n", begin); return -1; } - if (end<0 || end>=file.counter || end<begin) - { - fprintf(stderr,"ERROR: Selected end message %d is out of range!\n",end); + + if ((end < 0) || (end >= file.counter) || (end < begin)) { + fprintf(stderr, "ERROR: Selected end message %d is out of range!\n", end); return -1; } - for (num = begin; num <= end ;num++) - { - dlt_file_message(&file,num,vflag); - if (xflag) - { - printf("%d ",num); - dlt_message_print_hex(&(file.msg),text,DLT_CONVERT_TEXTBUFSIZE,vflag); + for (num = begin; num <= end; num++) { + dlt_file_message(&file, num, vflag); + + if (xflag) { + printf("%d ", num); + dlt_message_print_hex(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); } else if (aflag) { - printf("%d ",num); + printf("%d ", num); - dlt_message_header(&(file.msg),text,DLT_CONVERT_TEXTBUFSIZE,vflag); + dlt_message_header(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); - printf("%s ",text); + printf("%s ", text); - dlt_message_payload(&file.msg,text,DLT_CONVERT_TEXTBUFSIZE,DLT_OUTPUT_ASCII,vflag); + dlt_message_payload(&file.msg, text, DLT_CONVERT_TEXTBUFSIZE, DLT_OUTPUT_ASCII, vflag); - printf("[%s]\n",text); + printf("[%s]\n", text); } else if (mflag) { - printf("%d ",num); - dlt_message_print_mixed_plain(&(file.msg),text,DLT_CONVERT_TEXTBUFSIZE,vflag); + printf("%d ", num); + dlt_message_print_mixed_plain(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); } else if (sflag) { - printf("%d ",num); + printf("%d ", num); - dlt_message_header(&(file.msg),text,DLT_CONVERT_TEXTBUFSIZE,vflag); + dlt_message_header(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); - printf("%s \n",text); + printf("%s \n", text); } /* if file output enabled write message */ - if (ovalue) - { + if (ovalue) { iov[0].iov_base = file.msg.headerbuffer; iov[0].iov_len = file.msg.headersize; iov[1].iov_base = file.msg.databuffer; iov[1].iov_len = file.msg.datasize; bytes_written = writev(ohandle, iov, 2); - if (0 > bytes_written){ - printf("in main: writev(ohandle, iov, 2); returned an error!" ); - dlt_file_free(&file,vflag); - return -1; + + if (0 > bytes_written) { + printf("in main: writev(ohandle, iov, 2); returned an error!"); + dlt_file_free(&file, vflag); + return -1; } } /* check for new messages if follow flag set */ - if (wflag && num==end) - { - while (1) - { - while (dlt_file_read(&file,0)>=0) - { - } - if (end == (file.counter-1)) - { + if (wflag && (num == end)) { + while (1) { + while (dlt_file_read(&file, 0) >= 0) {} + + if (end == (file.counter - 1)) { /* Sleep if no new message was received */ sleep(1); } - else - { + else { /* set new end of log file and continue reading */ - end = file.counter-1; + end = file.counter - 1; break; } } } } } - if (cflag) - { - printf("Total number of messages: %d\n",file.counter_total); + + if (cflag) { + printf("Total number of messages: %d\n", file.counter_total); + if (file.filter) - { - printf("Filtered number of messages: %d\n",file.counter); - } + printf("Filtered number of messages: %d\n", file.counter); } } + if (ovalue) - { close(ohandle); - } - if (index == optind) - { + + if (index == optind) { /* no file selected, show usage and terminate */ - fprintf(stderr,"ERROR: No file selected\n"); + fprintf(stderr, "ERROR: No file selected\n"); usage(); return -1; } - dlt_file_free(&file,vflag); + dlt_file_free(&file, vflag); return 0; } |