fix patch 998291

[nagiosplug.git] / plugins / check_pgsql.c

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index de76735bf1cc14c5a2c498321f7deca53e424546..e66eeaff91e9d3dc439422b169a91b93f2211851 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -121,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
@@ -135,7 +136,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */
@@ -255,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;
@@ -390,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"));
 
@@ -440,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);
 }