Removed old terminate function (Bug 1093491)

[nagiosplug.git] / plugins / check_pgsql.c

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 826a105706f1a8d252502cb44acef098a201f099..d56ce9b0e2b5e5264440e552c939c24c325df915 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -136,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 */
@@ -209,9 +209,7 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':     /* usage */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                case 'h':     /* help */
                        print_help ();
                        exit (STATE_OK);
@@ -232,7 +230,7 @@ process_arguments (int argc, char **argv)
                        break;
                case 'w':     /* warning time threshold */
                        if (!is_nonnegative (optarg))
-                               usage2 (_("Critical threshold must be a positive integer"), optarg);
+                               usage2 (_("Warning threshold must be a positive integer"), optarg);
                        else
                                twarn = strtod (optarg, NULL);
                        break;
@@ -391,7 +389,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"));
 
@@ -403,7 +401,7 @@ print_help (void)
 
        printf (_(UT_IPv46));
 
-       printf (S_("\
+       printf (_("\
   -d, --database=STRING\n\
     Database to check (default: %s)\n\
   -l, --logname = STRING\n\
@@ -417,18 +415,18 @@ print_help (void)
 
        printf (_(UT_VERBOSE));
 
-       printf (S_("\nAll parameters are optional.\n\
+       printf (_("\nAll parameters are optional.\n\
 \n\
 This plugin tests a PostgreSQL DBMS to determine whether it is active and\n\
 accepting queries. In its current operation, it simply connects to the\n\
 specified database, and then disconnects. If no database is specified, it\n\
 connects to the template1 database, which is present in every functioning \n\
 PostgreSQL DBMS.\n"));
-       printf (S_("\n\
+       printf (_("\n\
 The plugin will connect to a local postmaster if no host is specified. To\n\
 connect to a remote host, be sure that the remote postmaster accepts TCP/IP\n\
 connections (start the postmaster with the -i option).\n"));
-       printf (S_("\n\
+       printf (_("\n\
 Typically, the nagios user (unless the --logname option is used) should be\n\
 able to connect to the database without a password. The plugin can also send\n\
 a password, but no effort is made to obsure or encrypt the password.\n"));
@@ -441,12 +439,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);
 }