X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_pgsql.c;h=2d80fad1bb04560c89fafc1dcd1c639ad942bcc0;hb=80da8e6dab2b37abc491018b2894414b80cfcbf4;hp=a2fd90e01b2f4c250950766d51a2d1179c8626b6;hpb=de757dba6e4b8b8271d5b4c74b87ee0229f4eb57;p=nagiosplug.git

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index a2fd90e..2d80fad 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 
-#define PROGNAME "check_pgsql"
+const char *progname = "check_pgsql";
 #define REVISION "$Revision$"
 #define COPYRIGHT "1999-2001"
 #define AUTHOR "Karl DeBisschop"
@@ -44,7 +44,7 @@
   -H, --hostname=STRING\n\
     Name or numeric IP address of machine running backend\n\
   -P, --port=INTEGER\n\
-    Port running backend (default: %s)\n\
+    Port running backend (default: %d)\n\
   -d, --database=STRING\n\
     Database to check (default: %s)\n\
   -l, --logname = STRING\n\
@@ -70,10 +70,12 @@ a password, but no effort is made to obsure or encrypt the password.\n"
 
 #define DEFAULT_DB "template1"
 #define DEFAULT_HOST "127.0.0.1"
-#define DEFAULT_PORT "5432"
-#define DEFAULT_WARN 2
-#define DEFAULT_CRIT 8
-#define DEFAULT_TIMEOUT 30
+enum {
+	DEFAULT_PORT = 5432,
+	DEFAULT_WARN = 2,
+	DEFAULT_CRIT = 8,
+	DEFAULT_TIMEOUT = 30
+};
 
 #include "config.h"
 #include "common.h"
@@ -90,7 +92,7 @@ int is_pg_logname (char *);
 
 char *pghost = NULL;						/* host name of the backend server */
 char *pgport = NULL;						/* port of the backend server */
-char default_port[4] = DEFAULT_PORT;
+int default_port = DEFAULT_PORT;
 char *pgoptions = NULL;
 char *pgtty = NULL;
 char dbName[NAMEDATALEN] = DEFAULT_DB;
@@ -122,7 +124,7 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 <manvolnum>5<manvolnum>
 </refmeta>
 <refnamdiv>
-<refname>&PROGNAME;</refname>
+<refname>&progname;</refname>
 <refpurpose>&SUMMARY;</refpurpose>
 </refnamdiv>
 </refentry>
@@ -218,7 +220,7 @@ main (int argc, char **argv)
 void
 print_help (void)
 {
-	print_revision (PROGNAME, REVISION);
+	print_revision (progname, REVISION);
 	printf
 		("Copyright (c) %s %s <%s>\n\n%s\n",
 		 COPYRIGHT, AUTHOR, EMAIL, SUMMARY);
@@ -235,7 +237,7 @@ print_usage (void)
 	printf ("Usage:\n" " %s %s\n"
 					" %s (-h | --help) for detailed help\n"
 					" %s (-V | --version) for version information\n",
-					PROGNAME, OPTIONS, PROGNAME, PROGNAME);
+					progname, OPTIONS, progname, progname);
 }
 
 
@@ -266,22 +268,22 @@ process_arguments (int argc, char **argv)
 
 	while (1) {
 #ifdef HAVE_GETOPT_H
-		c = getopt_long (argc, argv, "+?hVt:c:w:H:P:d:l:p:a:",
+		c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:",
 		                 long_options, &option_index);
 #else
-		c = getopt (argc, argv, "+?hVt:c:w:H:P:d:l:p:a:");
+		c = getopt (argc, argv, "hVt:c:w:H:P:d:l:p:a:");
 #endif
 		if (c == EOF)
 			break;
 
 		switch (c) {
 		case '?':     /* usage */
-			usage2 ("Unknown argument", optarg);
+			usage3 ("Unknown argument", optopt);
 		case 'h':     /* help */
 			print_help ();
 			exit (STATE_OK);
 		case 'V':     /* version */
-			print_revision (PROGNAME, REVISION);
+			print_revision (progname, REVISION);
 			exit (STATE_OK);
 		case 't':     /* timeout period */
 			if (!is_integer (optarg))