From 76409ba6a98960ec910d93d159c820f25041eea8 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Wed, 18 Jul 2012 11:27:50 +0200 Subject: [GDLT-115]: Prevent return value from DLT_REGISTER_APP --- include/dlt/dlt_user_macros.h | 4 ++-- src/examples/dlt-example-filetransfer.c | 2 +- src/tests/dlt-test-filetransfer.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 include/dlt/dlt_user_macros.h diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h old mode 100755 new mode 100644 index 1f95f3c..ab17108 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -99,9 +99,9 @@ extern DltContext CONTEXT; * @param APPID application id with maximal four characters * @param DESCRIPTION ASCII string containing description */ -#define DLT_REGISTER_APP(APPID,DESCRIPTION) \ +#define DLT_REGISTER_APP(APPID,DESCRIPTION) do {\ dlt_check_library_version(_DLT_PACKAGE_MAJOR_VERSION, _DLT_PACKAGE_MINOR_VERSION ); \ - dlt_register_app( APPID, DESCRIPTION); + dlt_register_app( APPID, DESCRIPTION);} while(0) /** diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index b1d3e1a..01867de 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -194,7 +194,7 @@ int main(int argc, char* argv[]) } //Register the application at the dlt-daemon - dltResult = DLT_REGISTER_APP(apid,FLTR_APP_DESC); + DLT_REGISTER_APP(apid,FLTR_APP_DESC); //Register the context of the main program at the dlt-daemon dltResult = DLT_REGISTER_CONTEXT(fileContext,ctid,FLTR_CONTEXT_DESC); diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 2d0b9ef..b436909 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -373,7 +373,7 @@ int main(void) file3_3 = "dlt-test-filetransfer-doesntExist_3"; //Register the application at the dlt-daemon - dltResult = DLT_REGISTER_APP("FLTR","Test Application filetransfer"); + DLT_REGISTER_APP("FLTR","Test Application filetransfer"); // if(dltResult < 0){ // printf("Error: DLT_REIGSTER_APP: FLTR\n"); // return -1; -- cgit v1.2.1