Code

Making messages more consistent
[nagiosplug.git] / plugins / check_time.c
index 0de6718bb05a57a5522d0e07e32fbf48b1a6c559..314b768369559fa8f02d158adbcf694cbcef3555 100644 (file)
@@ -61,7 +61,7 @@ main (int argc, char **argv)
        textdomain (PACKAGE);
 
        if (process_arguments (argc, argv) != OK)
-               usage (_("Invalid command arguments supplied\n"));
+               usage (_("Incorrect arguments supplied\n"));
 
        /* initialize alarm signal handling */
        signal (SIGALRM, socket_timeout_alarm_handler);
@@ -226,7 +226,7 @@ process_arguments (int argc, char **argv)
                        exit (STATE_OK);
                case 'H':                                                                       /* hostname */
                        if (is_host (optarg) == FALSE)
-                               usage (_("Invalid host name/address\n"));
+                               usage2 (_("Invalid host name/address"), optarg);
                        server_address = optarg;
                        break;
                case 'w':                                                                       /* warning-variance */
@@ -288,7 +288,7 @@ process_arguments (int argc, char **argv)
                        break;
                case 't':                                                                       /* timeout */
                        if (!is_intnonneg (optarg))
-                               usage (_("Timeout interval must be a nonnegative integer\n"));
+                               usage2 (_("Timeout interval must be a positive integer"), optarg);
                        else
                                socket_timeout = atoi (optarg);
                        break;
@@ -301,7 +301,7 @@ process_arguments (int argc, char **argv)
        if (server_address == NULL) {
                if (argc > c) {
                        if (is_host (argv[c]) == FALSE)
-                               usage (_("Invalid host name/address\n"));
+                               usage2 (_("Invalid host name/address"), optarg);
                        server_address = argv[c];
                }
                else {
@@ -325,8 +325,8 @@ print_help (void)
 
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Ethan Galstad\n"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Ethan Galstad\n");
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("\
 This plugin will check the time on the specified host.\n\n"));