From: Karl DeBisschop <kdebisschop@users.sourceforge.net>
Date: Mon, 13 Jan 2003 12:21:51 +0000 (+0000)
Subject: convert PROGANE from a define to a const char
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7f7188e8de0a21d7846d0b0abcaa9fd38208ffbc;p=nagiosplug.git

convert PROGANE from a define to a const char


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

diff --git a/contrib/check_dhcp.c b/contrib/check_dhcp.c
index 6a6037f..24b82f9 100644
--- a/contrib/check_dhcp.c
+++ b/contrib/check_dhcp.c
@@ -42,7 +42,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#define PROGNAME "check_dhcp"
+const char *progname = "check_dhcp";
 
 /*#define DEBUG*/
 #define HAVE_GETOPT_H
@@ -810,7 +810,7 @@ int get_results(void){
 /* print usage help */
 void print_help(void){
 
-	/*print_revision(PROGNAME,"$Revision$");*/
+	/*print_revision(progname,"$Revision$");*/
 
 	printf("Copyright (c) 2001-2002 Ethan Galstad (nagios@nagios.org)\n\n");
 	printf("This plugin tests the availability of DHCP servers on a network.\n\n");
@@ -844,9 +844,9 @@ void print_help(void){
 /* prints usage information */
 void print_usage(void){
 
-	printf("Usage: %s [-s serverip] [-r requestedip] [-t timeout] [-i interface]\n",PROGNAME);
-	printf("       %s --help\n",PROGNAME);
-	printf("       %s --version\n",PROGNAME);
+	printf("Usage: %s [-s serverip] [-r requestedip] [-t timeout] [-i interface]\n",progname);
+	printf("       %s --help\n",progname);
+	printf("       %s --version\n",progname);
 
 	return;
         }
@@ -962,7 +962,7 @@ int call_getopt(int argc, char **argv){
 
 		case 'V': /* version */
 
-			/*print_revision(PROGNAME,"$Revision$");*/
+			/*print_revision(progname,"$Revision$");*/
 			exit(STATE_OK);
 
 		case 'h': /* help */
diff --git a/contrib/check_fping_in.c b/contrib/check_fping_in.c
index 50fd5ee..9f844b7 100644
--- a/contrib/check_fping_in.c
+++ b/contrib/check_fping_in.c
@@ -35,7 +35,7 @@
 #include "popen.h"
 #include "utils.h"
 
-#define PROGNAME "check_fping"
+const char *progname = "check_fping_in";
 #define PACKET_COUNT 15
 #define PACKET_SIZE 56
 #define CRITICAL_COUNT 2
@@ -379,7 +379,7 @@ int process_arguments(int argc, char **argv)
 
 void print_usage(void)
 {
-	printf("Usage: %s <host_address> <host_address> [<host_address>] ...\n",PROGNAME);
+	printf("Usage: %s <host_address> <host_address> [<host_address>] ...\n",progname);
 }
 
 
@@ -389,7 +389,7 @@ void print_usage(void)
 void print_help(void)
 {
 
-	print_revision(PROGNAME,"$Revision$");
+	print_revision(progname,"$Revision$");
 
 	printf
 		("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"
diff --git a/contrib/check_rbl.c b/contrib/check_rbl.c
index 5c66113..69fdd23 100644
--- a/contrib/check_rbl.c
+++ b/contrib/check_rbl.c
@@ -21,7 +21,7 @@
 #include "popen.h"
 #include "string.h"
 
-#define PROGNAME "check_rbl"
+const char progname = "check_rbl";
 
 int process_arguments(int, char **);
 int call_getopt(int, char **);
@@ -260,7 +260,7 @@ int call_getopt(int argc, char **argv)
 				}
 				break;
       case 'V': /* version */
-				print_revision(PROGNAME,"$Revision$");
+				print_revision(progname,"$Revision$");
 				exit(STATE_OK);
       case 'h': /* help */
 				print_help();
@@ -290,7 +290,7 @@ int validate_arguments(void)
 
 void print_help(void)
 {
-	print_revision(PROGNAME,"$Revision$");
+	print_revision(progname,"$Revision$");
 	printf
 		("Copyright (c) 2000 Karl DeBisschop\n\n"
 		 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");
@@ -325,5 +325,5 @@ void print_usage(void)
 		("Usage: %s -H hostip -r rblname [-s server] [-t timeout] [-v]\n"
 		 "       %s --help\n"
 		 "       %s --version\n",
-		 PROGNAME,PROGNAME,PROGNAME);
+		 progname, progname, progname);
 }