establish "UT_" namespace for usage text in #defines

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@631 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 7 insertions, 9 deletions

diff --git a/plugins/utils.h b/plugins/utils.h
index d95422ad..b10f0e5a 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -92,37 +92,35 @@ char *state_text (int result);
 #define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\
 \t<%s>\n\n"
 
-#define HELP_VRSN "\
+#define UT_HELP_VRSN "\
 \nOptions:\n\
  -h, --help\n\
     Print detailed help screen\n\
  -V, --version\n\
     Print version information\n"
 
-#define HOST_PORT "\
+#define UT_HOST_PORT "\
  -H, --hostname=ADDRESS\n\
     Host name or IP Address\n\
  -%c, --port=INTEGER\n\
     Port number (default: %s)\n"
 
-#define IPv46 "\
+#define UT_IPv46 "\
  -4, --use-ipv4\n\
     Use IPv4 connection\n\
  -6, --use-ipv6\n\
     Use IPv6 connection\n"
 
-#define VRBS "\
+#define UT_VERBOSE "\
  -v, --verbose\n\
     Show details for command-line debugging (Nagios may truncate output)\n"
 
-#define WARN_CRIT_TO "\
+#define UT_WARN_CRIT "\
  -w, --warning=DOUBLE\n\
     Response time to result in warning status (seconds)\n\
  -c, --critical=DOUBLE\n\
-    Response time to result in critical status (seconds)\n\
- -t, --timeout=INTEGER\n\
-    Seconds before connection times out (default: %d)\n"
+    Response time to result in critical status (seconds)\n"
 
-#define TIMEOUT "\
+#define UT_TIMEOUT "\
  -t, --timeout=INTEGER\n\
     Seconds before connection times out (default: %d)\n"