From 937e0ed9e50c16d08b02c581b9e8658621d55cec Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 28 Jan 2017 09:32:07 +0100 Subject: [PATCH] fixed compiler warnings --- src/tools/ebusctl.cpp | 12 ++++++------ src/tools/ebusfeed.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tools/ebusctl.cpp b/src/tools/ebusctl.cpp index 1f907783..b2de666d 100644 --- a/src/tools/ebusctl.cpp +++ b/src/tools/ebusctl.cpp @@ -56,17 +56,17 @@ static struct options opt = { }; /** the version string of the program. */ -const char *argp_program_version = "ebusctl of """PACKAGE_STRING""; +const char *argp_program_version = "ebusctl of """ PACKAGE_STRING ""; /** the report bugs to address of the program. */ -const char *argp_program_bug_address = ""PACKAGE_BUGREPORT""; +const char *argp_program_bug_address = "" PACKAGE_BUGREPORT ""; /** the documentation of the program. */ static const char argpdoc[] = - "Client for acessing "PACKAGE" via TCP.\n" + "Client for acessing " PACKAGE " via TCP.\n" "\v" - "If given, send COMMAND together with CMDOPT options to "PACKAGE".\n" - "Use 'help' as COMMAND for help on available "PACKAGE" commands."; + "If given, send COMMAND together with CMDOPT options to " PACKAGE ".\n" + "Use 'help' as COMMAND for help on available " PACKAGE " commands."; /** the description of the accepted arguments. */ static char argpargsdoc[] = "\nCOMMAND [CMDOPT...]"; @@ -74,7 +74,7 @@ static char argpargsdoc[] = "\nCOMMAND [CMDOPT...]"; /** the definition of the known program arguments. */ static const struct argp_option argpoptions[] = { {NULL, 0, NULL, 0, "Options:", 1 }, - {"server", 's', "HOST", 0, "Connect to HOST running "PACKAGE" (name or IP) [localhost]", 0 }, + {"server", 's', "HOST", 0, "Connect to HOST running " PACKAGE " (name or IP) [localhost]", 0 }, {"port", 'p', "PORT", 0, "Connect to PORT on HOST [8888]", 0 }, {NULL, 0, NULL, 0, NULL, 0 }, diff --git a/src/tools/ebusfeed.cpp b/src/tools/ebusfeed.cpp index 1b9db7ee..f18e75fa 100644 --- a/src/tools/ebusfeed.cpp +++ b/src/tools/ebusfeed.cpp @@ -57,14 +57,14 @@ static struct options opt = { }; /** the version string of the program. */ -const char *argp_program_version = "ebusfeed of """PACKAGE_STRING""; +const char *argp_program_version = "ebusfeed of """ PACKAGE_STRING ""; /** the report bugs to address of the program. */ -const char *argp_program_bug_address = ""PACKAGE_BUGREPORT""; +const char *argp_program_bug_address = "" PACKAGE_BUGREPORT ""; /** the documentation of the program. */ static const char argpdoc[] = - "Feed data from an "PACKAGE" DUMPFILE to a serial device.\n" + "Feed data from an " PACKAGE " DUMPFILE to a serial device.\n" "\v" "With no DUMPFILE, /tmp/ebus_dump.bin is used.\n" "\n" @@ -73,7 +73,7 @@ static const char argpdoc[] = " 2. create symbol links to appropriate devices, e.g.\n" " 'ln -s /dev/pts/2 /dev/ttyUSB60'\n" " 'ln -s /dev/pts/3 /dev/ttyUSB20'\n" - " 3. start "PACKAGE": '"PACKAGE" -f -d /dev/ttyUSB20 --nodevicecheck'\n" + " 3. start " PACKAGE ": '" PACKAGE " -f -d /dev/ttyUSB20 --nodevicecheck'\n" " 4. start ebusfeed: 'ebusfeed /path/to/ebus_dump.bin'\n"; /** the description of the accepted arguments. */