Removed old terminate function (Bug 1093491)

[nagiosplug.git] / plugins / check_swap.c

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 3a3ec35c7bd695e452c4a1df5e20e0db58ecc383..bcc6b170c6d4e554682d8c2c5fa94032828c696b 100644 (file)
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -56,10 +56,10 @@ main (int argc, char **argv)
        int result = STATE_UNKNOWN;
        char input_buffer[MAX_INPUT_BUFFER];
        char *perf;
-       int conv_factor = SWAP_CONVERSION;
 #ifdef HAVE_PROC_MEMINFO
        FILE *fp;
 #else
+       int conv_factor = SWAP_CONVERSION;
 # ifdef HAVE_SWAP
        char *temp_buffer;
        char *swap_command;
@@ -89,7 +89,7 @@ main (int argc, char **argv)
        tmp_status = strdup ("");
        perf = strdup ("");
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
 #ifdef HAVE_PROC_MEMINFO
@@ -194,7 +194,7 @@ main (int argc, char **argv)
                        dskfree = dskfree / conv_factor;
 #  endif
                        if (verbose >= 3)
-                               printf (_("total=%d, free=%d\n"), dsktotal, dskfree);
+                               printf (_("total=%llu, free=%llu\n"), dsktotal, dskfree);
 
                        dskused = dsktotal - dskfree;
                        total_swap += dsktotal;
@@ -239,7 +239,7 @@ main (int argc, char **argv)
        /* and now, tally 'em up */
        swapctl_res=swapctl(SC_LIST, tbl);
        if(swapctl_res < 0){
-               perror("swapctl failed: ");
+               perror(_("swapctl failed: "));
                result = STATE_WARNING;
        }
 
@@ -278,7 +278,7 @@ main (int argc, char **argv)
        /* and now, tally 'em up */
        swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
        if(swapctl_res < 0){
-               perror("swapctl failed: ");
+               perror(_("swapctl failed: "));
                result = STATE_WARNING;
        }
 
@@ -388,7 +388,7 @@ process_arguments (int argc, char **argv)
                                break;
                        }
                        else {
-                               usage (_("Warning threshold must be integer or percentage!\n"));
+                               usage4 (_("Warning threshold must be integer or percentage!"));
                        }
                case 'c':                                                                       /* critical size threshold */
                        if (is_intnonneg (optarg)) {
@@ -405,7 +405,7 @@ process_arguments (int argc, char **argv)
                                break;
                        }
                        else {
-                               usage (_("Critical threshold must be integer or percentage!\n"));
+                               usage4 (_("Critical threshold must be integer or percentage!"));
                        }
                case 'a':                                                                       /* all swap */
                        allswaps = TRUE;
@@ -420,9 +420,7 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case '?':                                                                       /* error */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                }
        }
 
@@ -460,12 +458,12 @@ validate_arguments (void)
                return ERROR;
        }
        else if (warn_percent < crit_percent) {
-               usage
-                       (_("Warning percentage should be more than critical percentage\n"));
+               usage4 
+                       (_("Warning percentage should be more than critical percentage"));
        }
        else if (warn_size < crit_size) {
-               usage
-                       (_("Warning free space should be more than critical free space\n"));
+               usage4
+                       (_("Warning free space should be more than critical free space"));
        }
        return OK;
 }
@@ -479,7 +477,7 @@ print_help (void)
 
        printf (_(COPYRIGHT), copyright, email);
 
-       printf (_("Check swap space on local server.\n\n"));
+       printf (_("Check swap space on local machine.\n\n"));
 
        print_usage ();
 
@@ -514,7 +512,7 @@ On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"));
 void
 print_usage (void)
 {
-       printf ("Usage:\n\
- %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
- %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname);
+       printf ("\
+Usage: %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
+       %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname);
 }