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/examples/dlt-example-filetransfer.c | 70 +++++-------- src/examples/dlt-example-user-common-api.c | 112 ++++++++------------ src/examples/dlt-example-user-func.c | 134 +++++++++--------------- src/examples/dlt-example-user.c | 159 +++++++++++------------------ 4 files changed, 178 insertions(+), 297 deletions(-) (limited to 'src/examples') diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index 0f4f038..f7028df 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -72,7 +72,7 @@ #define TIMEOUT 1 -//!Declare some context for the file transfer. It's not a must have to do this, but later you can set a filter on this context in the dlt viewer. +/*!Declare some context for the file transfer. It's not a must have to do this, but later you can set a filter on this context in the dlt viewer. */ DLT_DECLARE_CONTEXT(fileContext) @@ -83,7 +83,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-example-filetransfer [options] absolute-path-to-file\n"); printf("Simple filetransfer example"); @@ -99,16 +99,16 @@ void usage() } -//!Main program dlt-test-filestransfer starts here -int main(int argc, char* argv[]) +/*!Main program dlt-test-filestransfer starts here */ +int main(int argc, char *argv[]) { - //char str[MAXSTRLEN]; + /*char str[MAXSTRLEN]; */ int opt, timeout; char apid[DLT_ID_SIZE]; char ctid[DLT_ID_SIZE]; - //char version[255]; + /*char version[255]; */ int index; int dflag = 0; int iflag = 0; @@ -119,9 +119,7 @@ int main(int argc, char* argv[]) dlt_set_id(ctid, FLTR_CONTEXT); while ((opt = getopt(argc, argv, "idf:t:a:c:h")) != -1) - { - switch (opt) - { + switch (opt) { case 'd': { dflag = 1; @@ -139,12 +137,12 @@ int main(int argc, char* argv[]) } 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': @@ -154,68 +152,52 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'a' || optopt == 'c' || optopt == 't') - { + if ((optopt == 'a') || (optopt == 'c') || (optopt == 't')) 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); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + /* unknown or wrong option used, show usage information and terminate */ usage(); return -1; } } - } + + for (index = optind; index < argc; index++) - { file = argv[index]; - } - if (file == 0) - { + if (file == 0) { /* no message, show usage and terminate */ - fprintf(stderr,"ERROR: No absolute path to file specified\n"); + fprintf(stderr, "ERROR: No absolute path to file specified\n"); usage(); return -1; } - if (tvalue) - { timeout = atoi(tvalue); - } else - { timeout = TIMEOUT; - } - //Register the application at the dlt-daemon - DLT_REGISTER_APP(apid,FLTR_APP_DESC); + /*Register the application at the dlt-daemon */ + DLT_REGISTER_APP(apid, FLTR_APP_DESC); - //Register the context of the main program at the dlt-daemon - DLT_REGISTER_CONTEXT(fileContext,ctid,FLTR_CONTEXT_DESC); + /*Register the context of the main program at the dlt-daemon */ + DLT_REGISTER_CONTEXT(fileContext, ctid, FLTR_CONTEXT_DESC); - //More details in corresponding methods - if( iflag ) - { - dlt_user_log_file_infoAbout(&fileContext,file); - } + /*More details in corresponding methods */ + if (iflag) + dlt_user_log_file_infoAbout(&fileContext, file); - if( dlt_user_log_file_complete(&fileContext,file,dflag,timeout) < 0 ) - { + if (dlt_user_log_file_complete(&fileContext, file, dflag, timeout) < 0) printf("File couldn't be transferred. Please check the dlt log messages.\n"); - } - //Unregister the context in which the file transfer happened from the dlt-daemon + /*Unregister the context in which the file transfer happened from the dlt-daemon */ DLT_UNREGISTER_CONTEXT(fileContext); - //Unregister the context of the main program from the dlt-daemon + /*Unregister the context of the main program from the dlt-daemon */ DLT_UNREGISTER_APP(); return 0; diff --git a/src/examples/dlt-example-user-common-api.c b/src/examples/dlt-example-user-common-api.c index 171ca89..880ea97 100644 --- a/src/examples/dlt-example-user-common-api.c +++ b/src/examples/dlt-example-user-common-api.c @@ -72,7 +72,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-example-common-api [options] message\n"); printf("Generate DLT messages and store them to file or send them to daemon.\n"); @@ -94,7 +94,7 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { #ifdef DLT_TEST_ENABLE int cflag = 0; @@ -110,20 +110,21 @@ int main(int argc, char* argv[]) int c; char *text; - int num,maxnum; + int num, maxnum; int delay; - int state=-1,newstate; + int state = -1, newstate; opterr = 0; #ifdef DLT_TEST_ENABLE + while ((c = getopt (argc, argv, "vgcd:n:z:s:")) != -1) #else + while ((c = getopt (argc, argv, "vgd:n:")) != -1) #endif /* DLT_TEST_ENABLE */ { - switch (c) - { + switch (c) { #ifdef DLT_TEST_ENABLE case 'c': { @@ -158,18 +159,12 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'd' || optopt == 'f' || optopt == 'n') - { + if ((optopt == 'd') || (optopt == 'f') || (optopt == 'n')) 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); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); /* unknown or wrong option used, show usage information and terminate */ usage(); @@ -178,114 +173,93 @@ int main(int argc, char* argv[]) default: { abort (); - break;//for parasoft + break;/*for parasoft */ } } } for (index = optind; index < argc; index++) - { message = argv[index]; - } - if (message == 0) - { + if (message == 0) { /* no message, show usage and terminate */ - fprintf(stderr,"ERROR: No message selected\n"); + fprintf(stderr, "ERROR: No message selected\n"); usage(); return -1; } - DLT_REGISTER_APP("LOG","Test Application for Logging"); - DLT_REGISTER_CONTEXT_APP(mycontext,"TEST","LOG","Test Context for Logging"); + DLT_REGISTER_APP("LOG", "Test Application for Logging"); + DLT_REGISTER_CONTEXT_APP(mycontext, "TEST", "LOG", "Test Context for Logging"); text = message; if (nvalue) - { maxnum = atoi(nvalue); - } else - { maxnum = 10; - } if (dvalue) - { delay = atoi(dvalue) * 1000; - } else - { delay = 500 * 1000; - } - if (gflag) - { + if (gflag) { /* DLT messages to test Fibex non-verbose description: dlt-example-non-verbose.xml */ - DLT_LOG_ID0(mycontext,DLT_LOG_INFO,10); - DLT_LOG_ID1(mycontext,DLT_LOG_INFO,11,DLT_UINT16(1011)); - DLT_LOG_ID2(mycontext,DLT_LOG_INFO,12,DLT_UINT32(1012),DLT_UINT32(1013)); - DLT_LOG_ID2(mycontext,DLT_LOG_INFO,13,DLT_UINT8(123),DLT_FLOAT32(1.12)); - DLT_LOG_ID1(mycontext,DLT_LOG_INFO,14,DLT_STRING("DEAD BEEF")); + DLT_LOG_ID0(mycontext, DLT_LOG_INFO, 10); + DLT_LOG_ID1(mycontext, DLT_LOG_INFO, 11, DLT_UINT16(1011)); + DLT_LOG_ID2(mycontext, DLT_LOG_INFO, 12, DLT_UINT32(1012), DLT_UINT32(1013)); + DLT_LOG_ID2(mycontext, DLT_LOG_INFO, 13, DLT_UINT8(123), DLT_FLOAT32(1.12)); + DLT_LOG_ID1(mycontext, DLT_LOG_INFO, 14, DLT_STRING("DEAD BEEF")); } #ifdef DLT_TEST_ENABLE + if (cflag) - { dlt_user_test_corrupt_user_header(1); - } + if (svalue) - { - dlt_user_test_corrupt_message_size(1,atoi(svalue)); - } - if (zvalue) - { - char* buffer = malloc(atoi(zvalue)); - if(buffer==0) - { + dlt_user_test_corrupt_message_size(1, atoi(svalue)); + + if (zvalue) { + char *buffer = malloc(atoi(zvalue)); + + if (buffer == 0) { /* no message, show usage and terminate */ - fprintf(stderr,"Cannot allocate buffer memory!\n"); + fprintf(stderr, "Cannot allocate buffer memory!\n"); return -1; } - DLT_LOG2(mycontext,DLT_LOG_WARN,DLT_STRING(text),DLT_RAW(buffer,atoi(zvalue))); + + DLT_LOG2(mycontext, DLT_LOG_WARN, DLT_STRING(text), DLT_RAW(buffer, atoi(zvalue))); free(buffer); } + #endif /* DLT_TEST_ENABLE */ - for (num=0;num0) - { + if (delay > 0) usleep(delay); - } } sleep(1); diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c index 68b3397..b29ff9f 100644 --- a/src/examples/dlt-example-user-func.c +++ b/src/examples/dlt-example-user-func.c @@ -63,8 +63,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 #include @@ -88,7 +88,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-example-user-func [options] message\n"); printf("Generate DLT messages and store them to file or send them to daemon.\n"); @@ -104,7 +104,7 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { int gflag = 0; int aflag = 0; @@ -116,15 +116,13 @@ int main(int argc, char* argv[]) int index; int c; char *text; - int num,maxnum; + int num, maxnum; int delay; opterr = 0; while ((c = getopt (argc, argv, "vgad:f:n:")) != -1) - { - switch (c) - { + switch (c) { case 'g': { gflag = 1; @@ -152,18 +150,12 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'd' || optopt == 'f' || optopt == 'n') - { + if ((optopt == 'd') || (optopt == 'f') || (optopt == 'n')) 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); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); /* unknown or wrong option used, show usage information and terminate */ usage(); @@ -172,129 +164,101 @@ int main(int argc, char* argv[]) default: { abort (); - return -1;//for parasoft + return -1;/*for parasoft */ } } - } + + for (index = optind; index < argc; index++) - { message = argv[index]; - } - if (message == 0) - { + if (message == 0) { /* no message, show usage and terminate */ - fprintf(stderr,"ERROR: No message selected\n"); + fprintf(stderr, "ERROR: No message selected\n"); usage(); return -1; } - if (fvalue) - { + if (fvalue) { /* DLT is intialised automatically, except another output target will be used */ - if (dlt_init_file(fvalue)<0) /* log to file */ - { + if (dlt_init_file(fvalue) < 0) /* log to file */ return -1; - } } - dlt_register_app("LOG","Test Application for Logging"); + dlt_register_app("LOG", "Test Application for Logging"); - dlt_register_context(&mycontext,"TEST","Test Context for Logging"); + dlt_register_context(&mycontext, "TEST", "Test Context for Logging"); dlt_register_injection_callback(&mycontext, 0xFFF, dlt_user_injection_callback); text = message; if (gflag) - { dlt_nonverbose_mode(); - } if (aflag) - { dlt_enable_local_print(); - } if (nvalue) - { maxnum = atoi(nvalue); - } else - { maxnum = 10; - } if (dvalue) - { delay = atoi(dvalue) * 1000; - } else - { delay = 500 * 1000; - } - if (gflag) - { + if (gflag) { /* DLT messages to test Fibex non-verbose description: dlt-example-non-verbose.xml */ - if (dlt_user_log_write_start_id(&mycontext,&mycontextdata,DLT_LOG_INFO,10)>0) - { + if (dlt_user_log_write_start_id(&mycontext, &mycontextdata, DLT_LOG_INFO, 10) > 0) dlt_user_log_write_finish(&mycontextdata); - } - if (dlt_user_log_write_start_id(&mycontext,&mycontextdata,DLT_LOG_INFO,11)>0) - { - dlt_user_log_write_uint16(&mycontextdata,1011); + + if (dlt_user_log_write_start_id(&mycontext, &mycontextdata, DLT_LOG_INFO, 11) > 0) { + dlt_user_log_write_uint16(&mycontextdata, 1011); dlt_user_log_write_finish(&mycontextdata); } - if (dlt_user_log_write_start_id(&mycontext,&mycontextdata,DLT_LOG_INFO,12)>0) - { - dlt_user_log_write_uint32(&mycontextdata,1012); - dlt_user_log_write_uint32(&mycontextdata,1013); + + if (dlt_user_log_write_start_id(&mycontext, &mycontextdata, DLT_LOG_INFO, 12) > 0) { + dlt_user_log_write_uint32(&mycontextdata, 1012); + dlt_user_log_write_uint32(&mycontextdata, 1013); dlt_user_log_write_finish(&mycontextdata); } - if (dlt_user_log_write_start_id(&mycontext,&mycontextdata,DLT_LOG_INFO,13)>0) - { - dlt_user_log_write_uint8(&mycontextdata,123); - dlt_user_log_write_float32(&mycontextdata,1.12); + + if (dlt_user_log_write_start_id(&mycontext, &mycontextdata, DLT_LOG_INFO, 13) > 0) { + dlt_user_log_write_uint8(&mycontextdata, 123); + dlt_user_log_write_float32(&mycontextdata, 1.12); dlt_user_log_write_finish(&mycontextdata); } - if (dlt_user_log_write_start_id(&mycontext,&mycontextdata,DLT_LOG_INFO,14)>0) - { - dlt_user_log_write_string(&mycontextdata,"DEAD BEEF"); + + if (dlt_user_log_write_start_id(&mycontext, &mycontextdata, DLT_LOG_INFO, 14) > 0) { + dlt_user_log_write_string(&mycontextdata, "DEAD BEEF"); dlt_user_log_write_finish(&mycontextdata); } } - for (num=0;num0) - { - dlt_user_log_write_int(&mycontextdata,num); - dlt_user_log_write_string(&mycontextdata,text); + if (dlt_user_log_write_start_id(&mycontext, &mycontextdata, DLT_LOG_WARN, num) > 0) { + dlt_user_log_write_int(&mycontextdata, num); + dlt_user_log_write_string(&mycontextdata, text); dlt_user_log_write_finish(&mycontextdata); } } else - { - /* Verbose mode */ - if (dlt_user_log_write_start(&mycontext,&mycontextdata,DLT_LOG_WARN)>0) - { - dlt_user_log_write_int(&mycontextdata,num); - dlt_user_log_write_string(&mycontextdata,text); - dlt_user_log_write_finish(&mycontextdata); - } + /* Verbose mode */ + if (dlt_user_log_write_start(&mycontext, &mycontextdata, DLT_LOG_WARN) > 0) { + dlt_user_log_write_int(&mycontextdata, num); + dlt_user_log_write_string(&mycontextdata, text); + dlt_user_log_write_finish(&mycontextdata); } - if (delay>0) - { + if (delay > 0) usleep(delay); - } } dlt_unregister_context(&mycontext); @@ -308,10 +272,10 @@ int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length { char text[1024]; - printf("Injection %d, Length=%d \n",service_id,length); - if (length>0) - { - dlt_print_mixed_string(text,1024,data,length,0); + printf("Injection %d, Length=%d \n", service_id, length); + + if (length > 0) { + dlt_print_mixed_string(text, 1024, data, length, 0); printf("%s \n", text); } diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index df5a163..19cf73f 100644 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -63,8 +63,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 #include @@ -79,7 +79,7 @@ int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length); int dlt_user_injection_callback_with_specific_data(uint32_t service_id, void *data, uint32_t length, void *priv_data); -void dlt_user_log_level_changed_callback(char context_id[DLT_ID_SIZE],uint8_t log_level,uint8_t trace_status); +void dlt_user_log_level_changed_callback(char context_id[DLT_ID_SIZE], uint8_t log_level, uint8_t trace_status); DLT_DECLARE_CONTEXT(mycontext1) DLT_DECLARE_CONTEXT(mycontext2) @@ -92,7 +92,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-example-user [options] message\n"); printf("Generate DLT messages and store them to file or send them to daemon.\n"); @@ -118,7 +118,7 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { int gflag = 0; int aflag = 0; @@ -140,20 +140,21 @@ int main(int argc, char* argv[]) int c; char *text; - int num,maxnum; + int num, maxnum; int delay; - int state=-1,newstate; + int state = -1, newstate; opterr = 0; #ifdef DLT_TEST_ENABLE + while ((c = getopt (argc, argv, "vgakcd:f:n:m:z:r:s:l:t:")) != -1) #else + while ((c = getopt (argc, argv, "vgakd:f:n:m:l:r:t:")) != -1) #endif /* DLT_TEST_ENABLE */ { - switch (c) - { + switch (c) { case 'g': { gflag = 1; @@ -223,18 +224,12 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'd' || optopt == 'f' || optopt == 'n'|| optopt == 'l' || optopt == 't') - { + if ((optopt == 'd') || (optopt == 'f') || (optopt == 'n') || (optopt == 'l') || (optopt == 't')) 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); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); /* unknown or wrong option used, show usage information and terminate */ usage(); @@ -243,39 +238,31 @@ int main(int argc, char* argv[]) default: { abort (); - break;//for parasoft + break;/*for parasoft */ } } } - if (rvalue == -1) - { + if (rvalue == -1) { for (index = optind; index < argc; index++) - { message = argv[index]; - } } - else /* allocate raw buffer */ - { + else { /* allocate raw buffer */ message = calloc(sizeof(char), rvalue); - memset(message, 'X', rvalue-1); + memset(message, 'X', rvalue - 1); } - if (message == 0) - { + if (message == 0) { /* no message, show usage and terminate */ - fprintf(stderr,"ERROR: No message selected\n"); + fprintf(stderr, "ERROR: No message selected\n"); usage(); return -1; } - if (fvalue) - { + if (fvalue) { /* DLT is initialized automatically, except another output target will be used */ - if (dlt_init_file(fvalue)<0) /* log to file */ - { + if (dlt_init_file(fvalue) < 0) /* log to file */ return -1; - } } dlt_with_session_id(1); @@ -283,68 +270,55 @@ int main(int argc, char* argv[]) dlt_with_ecu_id(1); dlt_verbose_mode(); - DLT_REGISTER_APP("LOG","Test Application for Logging"); + DLT_REGISTER_APP("LOG", "Test Application for Logging"); DLT_REGISTER_CONTEXT(mycontext1, "TEST", "Test Context for Logging"); DLT_REGISTER_CONTEXT_LLCCB(mycontext2, "TS1", "Test Context1 for injection", dlt_user_log_level_changed_callback); DLT_REGISTER_CONTEXT_LLCCB(mycontext3, "TS2", "Test Context2 for injection", dlt_user_log_level_changed_callback); DLT_REGISTER_INJECTION_CALLBACK(mycontext1, 0x1000, dlt_user_injection_callback); - DLT_REGISTER_INJECTION_CALLBACK_WITH_ID(mycontext2, 0x1000, dlt_user_injection_callback_with_specific_data, (void*)"TS1 context"); + DLT_REGISTER_INJECTION_CALLBACK_WITH_ID(mycontext2, + 0x1000, + dlt_user_injection_callback_with_specific_data, + (void *)"TS1 context"); DLT_REGISTER_INJECTION_CALLBACK(mycontext2, 0x1001, dlt_user_injection_callback); - DLT_REGISTER_INJECTION_CALLBACK_WITH_ID(mycontext3, 0x1000, dlt_user_injection_callback_with_specific_data, (void*)"TS2 context"); + DLT_REGISTER_INJECTION_CALLBACK_WITH_ID(mycontext3, + 0x1000, + dlt_user_injection_callback_with_specific_data, + (void *)"TS2 context"); DLT_REGISTER_INJECTION_CALLBACK(mycontext3, 0x1001, dlt_user_injection_callback); DLT_REGISTER_LOG_LEVEL_CHANGED_CALLBACK(mycontext1, dlt_user_log_level_changed_callback); text = message; - if(mvalue) - { - printf("Set log mode to %d\n",atoi(mvalue)); + if (mvalue) { + printf("Set log mode to %d\n", atoi(mvalue)); dlt_set_log_mode(atoi(mvalue)); } - if (gflag) - { DLT_NONVERBOSE_MODE(); - } if (aflag) - { DLT_ENABLE_LOCAL_PRINT(); - } if (kflag) - { DLT_LOG_MARKER(); - } if (nvalue) - { maxnum = atoi(nvalue); - } else - { maxnum = 10; - } if (dvalue) - { delay = atoi(dvalue) * 1000; - } else - { delay = 500 * 1000; - } if (tvalue) - { - dlt_set_resend_timeout_atexit(atoi(tvalue)); - } + dlt_set_resend_timeout_atexit(atoi(tvalue)); - if (gflag) - { + if (gflag) { /* DLT messages to test Fibex non-verbose description: dlt-example-non-verbose.xml */ DLT_LOG_ID(mycontext1, DLT_LOG_INFO, 10); DLT_LOG_ID(mycontext1, DLT_LOG_INFO, 11, DLT_UINT16(1011)); @@ -354,69 +328,58 @@ int main(int argc, char* argv[]) } #ifdef DLT_TEST_ENABLE + if (cflag) - { dlt_user_test_corrupt_user_header(1); - } + if (svalue) - { - dlt_user_test_corrupt_message_size(1,atoi(svalue)); - } - if (zvalue) - { - char* buffer = malloc(atoi(zvalue)); - if(buffer==0) - { + dlt_user_test_corrupt_message_size(1, atoi(svalue)); + + if (zvalue) { + char *buffer = malloc(atoi(zvalue)); + + if (buffer == 0) { /* no message, show usage and terminate */ - fprintf(stderr,"Cannot allocate buffer memory!\n"); + fprintf(stderr, "Cannot allocate buffer memory!\n"); return -1; } + DLT_LOG(mycontext1, DLT_LOG_WARN, DLT_STRING(text), DLT_RAW(buffer, atoi(zvalue))); free(buffer); } + #endif /* DLT_TEST_ENABLE */ - for (num=0;num0) - { + if (delay > 0) usleep(delay); - } } sleep(1); @@ -436,8 +399,7 @@ int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length DLT_LOG(mycontext1, DLT_LOG_INFO, DLT_STRING("Injection: "), DLT_UINT32(service_id)); printf("Injection %d, Length=%d \n", service_id, length); - if (length > 0) - { + if (length > 0) { dlt_print_mixed_string(text, 1024, data, length, 0); DLT_LOG(mycontext1, DLT_LOG_INFO, DLT_STRING("Data: "), DLT_STRING(text)); printf("%s \n", text); @@ -453,8 +415,7 @@ int dlt_user_injection_callback_with_specific_data(uint32_t service_id, void *da DLT_LOG(mycontext1, DLT_LOG_INFO, DLT_STRING("Injection: "), DLT_UINT32(service_id)); printf("Injection %d, Length=%d \n", service_id, length); - if (length > 0) - { + if (length > 0) { dlt_print_mixed_string(text, 1024, data, length, 0); DLT_LOG(mycontext1, DLT_LOG_INFO, DLT_STRING("Data: "), DLT_STRING(text), DLT_STRING(priv_data)); printf("%s \n", text); @@ -463,13 +424,13 @@ int dlt_user_injection_callback_with_specific_data(uint32_t service_id, void *da return 0; } -void dlt_user_log_level_changed_callback(char context_id[DLT_ID_SIZE],uint8_t log_level,uint8_t trace_status) +void dlt_user_log_level_changed_callback(char context_id[DLT_ID_SIZE], uint8_t log_level, uint8_t trace_status) { char text[5]; - text[4]=0; + text[4] = 0; - memcpy(text,context_id,DLT_ID_SIZE); + memcpy(text, context_id, DLT_ID_SIZE); - printf("Log level changed of context %s, LogLevel=%u, TraceState=%u \n",text,log_level,trace_status); + printf("Log level changed of context %s, LogLevel=%u, TraceState=%u \n", text, log_level, trace_status); } -- cgit v1.2.1