print_help and print_usage() cleanup

[nagiosplug.git] / plugins / check_pgsql.c

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index bbf47f07be755ec298d22ee5271f424090953e49..a00257127ddc82cbd9e71b3da798e73d1a9f981a 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -18,6 +18,17 @@
  
  *****************************************************************************/
 
+const char *progname = "check_pgsql";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include "common.h"
+#include "utils.h"
+
+#include "netutils.h"
+#include <libpq-fe.h>
+
 #define DEFAULT_DB "template1"
 #define DEFAULT_HOST "127.0.0.1"
 
@@ -27,10 +38,7 @@ enum {
        DEFAULT_CRIT = 8
 };
 
-#include "common.h"
-#include "utils.h"
-#include "netutils.h"
-#include <libpq-fe.h>
+
 
 int process_arguments (int, char **);
 int validate_arguments (void);
@@ -53,11 +61,6 @@ double tcrit = (double)DEFAULT_CRIT;
 PGconn *conn;
 /*PGresult   *res;*/
 
-const char *progname = "check_pgsql";
-const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
-
 
 /******************************************************************************
 
@@ -118,7 +121,8 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 int
 main (int argc, char **argv)
 {
-       int elapsed_time, status;
+       int elapsed_time;
+       int status = STATE_UNKNOWN;
 
        /* begin, by setting the parameters for a backend connection if the
         * parameters are null, then the system will try to use reasonable
@@ -132,13 +136,12 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != OK)
-               usage (_("check_pgsql: could not parse arguments\n"));
+       if (process_arguments (argc, argv) != TRUE)
+               usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */
        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-               printf (_("Cannot catch SIGALRM"));
-               return STATE_UNKNOWN;
+               usage4 (_("Cannot catch SIGALRM"));
        }
        alarm (timeout_interval);
 
@@ -253,7 +256,7 @@ process_arguments (int argc, char **argv)
                        break;
                case 'l':     /* login name */
                        if (!is_pg_logname (optarg))
-                               usage2 (_("user name is not valid"), optarg);
+                               usage2 (_("User name is not valid"), optarg);
                        else
                                pguser = optarg;
                        break;
@@ -388,7 +391,7 @@ print_help (void)
 
        print_revision (progname, revision);
 
-       printf (_(COPYRIGHT), copyright, email);
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("Test whether a PostgreSQL Database is accepting connections.\n\n"));
 
@@ -438,12 +441,7 @@ a password, but no effort is made to obsure or encrypt the password.\n"));
 void
 print_usage (void)
 {
-       printf (S_("\
-Usage:\n %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
-            [-t <timeout>]"), progname);
-       printf (S_("[-d <database>] [-l <logname>] [-p <password>]\n"));
-       printf (S_("\
-         %s (-h | --help) for detailed help\n\
-         %s (-V | --version) for version information\n"),
-                                       progname, progname);
+       printf ("\
+Usage: %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
+                  [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
 }