Code clean-up

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@403 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 59c3b7c8f3f3130062136e009d4f36a10224494d..8eb2b9b3230e92013cceba79acde5c42f40c7099 100644 (file)
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -128,7 +128,7 @@ main (int argc, char **argv)
                asprintf (&output, " Probably a non-existent host/domain");
 
        if (result == STATE_OK)
-               printf ("DNS ok - %d seconds response time (%s)\n",
+               printf ("DNS OK - %d seconds response time (%s)\n",
                                                (int) (end_time - start_time), output);
        else if (result == STATE_WARNING)
                printf ("DNS WARNING - %s\n", output);

diff --git a/plugins/check_http.c b/plugins/check_http.c
index d6f2c15a252d750d2ce64c4b39b9d4ec5ac4558e..c947bd8723b8569d78b2673fd135ba6cf2a4d001 100644 (file)
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -820,7 +820,7 @@ check_http (void)
 
        if (strlen (string_expect)) {
                if (strstr (page, string_expect)) {
-                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
+                       printf ("HTTP OK %s - %7.3f second response time %s%s|time=%7.3f\n",
                                status_line, elapsed_time,
                                timestamp, (display_html ? "</A>" : ""), elapsed_time);
                        exit (STATE_OK);
@@ -835,7 +835,7 @@ check_http (void)
        if (strlen (regexp)) {
                errcode = regexec (&preg, page, REGS, pmatch, 0);
                if (errcode == 0) {
-                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
+                       printf ("HTTP OK %s - %7.3f second response time %s%s|time=%7.3f\n",
                                status_line, elapsed_time,
                                timestamp, (display_html ? "</A>" : ""), elapsed_time);
                        exit (STATE_OK);
@@ -863,7 +863,7 @@ check_http (void)
                exit (STATE_WARNING);
        }
        /* We only get here if all tests have been passed */
-       asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
+       asprintf (&msg, "HTTP OK %s - %7.3f second response time %s%s|time=%7.3f\n",
                        status_line, (float)elapsed_time,
                        timestamp, (display_html ? "</A>" : ""), elapsed_time);
        terminate (STATE_OK, msg);

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 90fe6225eefe91a6f97dedb2dbab214e023ee5d3..5b983f4ba9e033cee721aeb0eef41733b6c705ce 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -7,7 +7,7 @@
  * 
  * Last Modified: $Date$
  *
- * Command line: check_ldap -h <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
+ * Command line: check_ldap -H <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
  *
  * Description:
  *
@@ -109,17 +109,17 @@ main (int argc, char *argv[])
        t_diff = time1 - time0;
 
        if (crit_time!=UNDEFINED && t_diff>=crit_time) {
-               printf ("LDAP critical - %i seconds response time\n", t_diff);
+               printf ("LDAP CRITICAL - %i seconds response time\n", t_diff);
                return STATE_CRITICAL;
        }
 
        if (warn_time!=UNDEFINED && t_diff>=warn_time) {
-               printf ("LDAP warning - %i seconds response time\n", t_diff);
+               printf ("LDAP WARNING - %i seconds response time\n", t_diff);
                return STATE_WARNING;
        }
 
        /* print out the result */
-       printf ("LDAP ok - %i seconds response time\n", t_diff);
+       printf ("LDAP OK - %i seconds response time\n", t_diff);
 
        return STATE_OK;
 }
@@ -198,7 +198,7 @@ process_arguments (int argc, char **argv)
                        crit_time = atoi (optarg);
                        break;
                default:
-                       usage ("check_ldap: could not parse arguments\n");
+                       usage ("check_ldap: could not parse unknown arguments\n");
                        break;
                }
        }

diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index ac2210257d4f32d422fe2794b6a16063f89237f6..da9a142027e3e5876bbe052f8a4915fef34826a0 100644 (file)
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -74,9 +74,8 @@ main (int argc, char **argv)
        alarm (socket_timeout);
 
        time (&start_time);
-       result =
-               process_udp_request (server_address, server_port, server_send,
-                                                                                                recv_buffer, MAX_INPUT_BUFFER - 1);
+       result = process_udp_request (server_address, server_port, server_send,
+                       recv_buffer, MAX_INPUT_BUFFER - 1);
        time (&end_time);
 
        if (result != STATE_OK) {