diff options
| -rw-r--r-- | plugins/check_http.c | 3 | ||||
| -rw-r--r-- | plugins/check_load.c | 2 | ||||
| -rw-r--r-- | plugins/check_ping.c | 9 | ||||
| -rw-r--r-- | plugins/check_procs.c | 2 | ||||
| -rw-r--r-- | plugins/check_smtp.c | 2 | ||||
| -rw-r--r-- | plugins/check_tcp.c | 2 |
6 files changed, 7 insertions, 13 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c index 44b55a77..594a368c 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
| @@ -269,8 +269,7 @@ main (int argc, char **argv) | |||
| 269 | int | 269 | int |
| 270 | process_arguments (int argc, char **argv) | 270 | process_arguments (int argc, char **argv) |
| 271 | { | 271 | { |
| 272 | int c, i = 1; | 272 | int c = 1; |
| 273 | char optchars[MAX_INPUT_BUFFER]; | ||
| 274 | 273 | ||
| 275 | #ifdef HAVE_GETOPT_H | 274 | #ifdef HAVE_GETOPT_H |
| 276 | int option_index = 0; | 275 | int option_index = 0; |
diff --git a/plugins/check_load.c b/plugins/check_load.c index 3c0ecad8..5caffbe8 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c | |||
| @@ -151,7 +151,7 @@ main (int argc, char **argv) | |||
| 151 | int | 151 | int |
| 152 | process_arguments (int argc, char **argv) | 152 | process_arguments (int argc, char **argv) |
| 153 | { | 153 | { |
| 154 | int c, i = 0; | 154 | int c = 0; |
| 155 | 155 | ||
| 156 | #ifdef HAVE_GETOPT_H | 156 | #ifdef HAVE_GETOPT_H |
| 157 | int option_index = 0; | 157 | int option_index = 0; |
diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 56c9557b..7ff7f284 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c | |||
| @@ -151,7 +151,7 @@ main (int argc, char **argv) | |||
| 151 | int | 151 | int |
| 152 | process_arguments (int argc, char **argv) | 152 | process_arguments (int argc, char **argv) |
| 153 | { | 153 | { |
| 154 | int c, i = 1; | 154 | int c = 1; |
| 155 | 155 | ||
| 156 | #ifdef HAVE_GETOPT_H | 156 | #ifdef HAVE_GETOPT_H |
| 157 | int option_index = 0; | 157 | int option_index = 0; |
| @@ -455,15 +455,12 @@ run_ping (char *command_line) | |||
| 455 | else | 455 | else |
| 456 | sprintf (warn_text, "%s %s", warn_text, input_buffer); | 456 | sprintf (warn_text, "%s %s", warn_text, input_buffer); |
| 457 | 457 | ||
| 458 | if (strstr (input_buffer, "DUPLICATES FOUND")) | 458 | if (strstr (input_buffer, "DUPLICATES FOUND")) { |
| 459 | /* cannot use the max function since STATE_UNKNOWN is max | ||
| 460 | result = max (result, STATE_WARNING); */ | ||
| 461 | if( !(result == STATE_CRITICAL) ){ | 459 | if( !(result == STATE_CRITICAL) ){ |
| 462 | result = STATE_WARNING; | 460 | result = STATE_WARNING; |
| 463 | } | 461 | } |
| 462 | } | ||
| 464 | else | 463 | else |
| 465 | /* cannot use the max function since STATE_UNKNOWN is max | ||
| 466 | result = max (result, STATE_CRITICAL); */ | ||
| 467 | result = STATE_CRITICAL ; | 464 | result = STATE_CRITICAL ; |
| 468 | } | 465 | } |
| 469 | (void) fclose (child_stderr); | 466 | (void) fclose (child_stderr); |
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 0b0a3c13..27cd2dae 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
| @@ -257,7 +257,7 @@ main (int argc, char **argv) | |||
| 257 | int | 257 | int |
| 258 | process_arguments (int argc, char **argv) | 258 | process_arguments (int argc, char **argv) |
| 259 | { | 259 | { |
| 260 | int c, i = 1; | 260 | int c = 1; |
| 261 | char *user; | 261 | char *user; |
| 262 | struct passwd *pw; | 262 | struct passwd *pw; |
| 263 | #ifdef HAVE_GETOPT_H | 263 | #ifdef HAVE_GETOPT_H |
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 5afb6941..6f174299 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
| @@ -78,7 +78,7 @@ int verbose = FALSE; | |||
| 78 | int | 78 | int |
| 79 | main (int argc, char **argv) | 79 | main (int argc, char **argv) |
| 80 | { | 80 | { |
| 81 | int sd, c; | 81 | int sd; |
| 82 | int result; | 82 | int result; |
| 83 | char buffer[MAX_INPUT_BUFFER] = ""; | 83 | char buffer[MAX_INPUT_BUFFER] = ""; |
| 84 | char *from_str = NULL; | 84 | char *from_str = NULL; |
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index e3fac22e..228a5335 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c | |||
| @@ -100,8 +100,6 @@ main (int argc, char **argv) | |||
| 100 | int i; | 100 | int i; |
| 101 | char buffer[MAX_INPUT_BUFFER] = ""; | 101 | char buffer[MAX_INPUT_BUFFER] = ""; |
| 102 | char *status = ""; | 102 | char *status = ""; |
| 103 | char *output = NULL; | ||
| 104 | char *ptr = NULL; | ||
| 105 | struct timeval tv; | 103 | struct timeval tv; |
| 106 | 104 | ||
| 107 | if (strstr (argv[0], "check_udp")) { | 105 | if (strstr (argv[0], "check_udp")) { |
