Code

Fixed bug with malloc of wrong size
[nagiosplug.git] / plugins / check_real.c
index 8df68d90c54ccc9cb73452082027ebd816347f7d..eb892c77fc594d8efbb911cbdffca387c0a934b1 100644 (file)
@@ -64,7 +64,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"));
 
        /* initialize alarm signal handling */
@@ -312,7 +312,7 @@ process_arguments (int argc, char **argv)
                                server_port = atoi (optarg);
                        }
                        else {
-                               usage (_("Port must be a positive integer\n"));
+                               usage4 (_("Port must be a positive integer"));
                        }
                        break;
                case 'w':                                                                       /* warning time threshold */
@@ -321,7 +321,7 @@ process_arguments (int argc, char **argv)
                                check_warning_time = TRUE;
                        }
                        else {
-                               usage (_("Warning time must be a positive integer\n"));
+                               usage4 (_("Warning time must be a positive integer"));
                        }
                        break;
                case 'c':                                                                       /* critical time threshold */
@@ -330,7 +330,7 @@ process_arguments (int argc, char **argv)
                                check_critical_time = TRUE;
                        }
                        else {
-                               usage (_("Critical time must be a nonnegative integer\n"));
+                               usage4 (_("Critical time must be a positive integer"));
                        }
                        break;
                case 'v':                                                                       /* verbose */
@@ -341,7 +341,7 @@ process_arguments (int argc, char **argv)
                                socket_timeout = atoi (optarg);
                        }
                        else {
-                               usage (_("Time interval must be a nonnegative integer\n"));
+                               usage4 (_("Timeout interval must be a positive integer"));
                        }
                        break;
                case 'V':                                                                       /* version */
@@ -351,9 +351,7 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case '?':                                                                       /* usage */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                }
        }
 
@@ -368,7 +366,7 @@ process_arguments (int argc, char **argv)
        }
 
        if (server_address==NULL)
-               usage (_("You must provide a server to check\n"));
+               usage4 (_("You must provide a server to check"));
 
        if (host_name==NULL)
                host_name = strdup (server_address);
@@ -438,7 +436,5 @@ print_usage (void)
 {
        printf ("\
 Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n\
-  [-t timeout] [-v]\n", progname);
-       
-       printf (UT_HLP_VRS, progname, progname);
+                  [-t timeout] [-v]\n", progname);
 }