From 6e246799b939d29fe80da03ee39a24ef68f78cb0 Mon Sep 17 00:00:00 2001 From: "Eric J. Mislivec" Date: Thu, 5 Jun 2014 16:05:46 -0500 Subject: Include common.h before any system headers. This should fix some problems building on AIX. --- plugins/negate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/negate.c') diff --git a/plugins/negate.c b/plugins/negate.c index 4bd09deb..222d2407 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -35,12 +35,12 @@ const char *email = "devel@monitoring-plugins.org"; #define DEFAULT_TIMEOUT 11 -#include - #include "common.h" #include "utils.h" #include "utils_cmd.h" +#include + /* char *command_line; */ static const char **process_arguments (int, char **); -- cgit v1.2.3-74-g34f1 From 88472d1804d3cd42e0ea8717d75191dfb3e3bbeb Mon Sep 17 00:00:00 2001 From: Spenser Reinhardt Date: Sun, 22 Jun 2014 22:59:03 -0500 Subject: plugins/negate.c - Reorder if statement, aiob Coverity 66480 - Potential array index out of bounds, since result was not verified to be positive prior to using as an index for state[]. Simply reording the if statement should resolve the issue. - SR --- plugins/negate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'plugins/negate.c') diff --git a/plugins/negate.c b/plugins/negate.c index 4bd09deb..7787d018 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -98,8 +98,7 @@ main (int argc, char **argv) die (max_state_alt (result, STATE_UNKNOWN), _("No data returned from command\n")); for (i = 0; i < chld_out.lines; i++) { - if (subst_text && result != state[result] && - result >= 0 && result <= 4) { + if (subst_text && result >= 0 && result <= 4 && result != state[result]) { /* Loop over each match found */ while ((sub = strstr (chld_out.line[i], state_text (result)))) { /* Terminate the first part and skip over the string we'll substitute */ -- cgit v1.2.3-74-g34f1 From aa16beb9711c1a235259401e8883f5d807a0a11d Mon Sep 17 00:00:00 2001 From: Spenser Reinhardt Date: Sun, 22 Jun 2014 23:10:50 -0500 Subject: plugins/negate.c - Function should not return. Coverity 66479 - validate_arguments has no need to return anything, as it dies on error, yet was set to return an int. Set to void to resolve warning. --- plugins/negate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/negate.c') diff --git a/plugins/negate.c b/plugins/negate.c index 7787d018..d512e346 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -44,7 +44,7 @@ const char *email = "devel@monitoring-plugins.org"; /* char *command_line; */ static const char **process_arguments (int, char **); -int validate_arguments (char **); +void validate_arguments (char **); void print_help (void); void print_usage (void); int subst_text = FALSE; @@ -205,7 +205,7 @@ process_arguments (int argc, char **argv) } -int +void validate_arguments (char **command_line) { if (command_line[0] == NULL) -- cgit v1.2.3-74-g34f1