From 07f9c438f31de7a280e43c4196a32d200ad41fbe Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:10:55 +0200 Subject: Fixes for -Wsign-compare --- plugins/check_apt.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'plugins/check_apt.c') diff --git a/plugins/check_apt.c b/plugins/check_apt.c index fa982ae3..290c88ed 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -94,7 +94,7 @@ static int stderr_warning = 0; /* if a cmd issued output on stderr */ static int exec_warning = 0; /* if a cmd exited non-zero */ int main (int argc, char **argv) { - int result=STATE_UNKNOWN, packages_available=0, sec_count=0, i=0; + int result=STATE_UNKNOWN, packages_available=0, sec_count=0; char **packages_list=NULL, **secpackages_list=NULL; /* Parse extra opts if any */ @@ -142,10 +142,11 @@ int main (int argc, char **argv) { qsort(secpackages_list, sec_count, sizeof(char*), cmpstringp); qsort(packages_list, packages_available-sec_count, sizeof(char*), cmpstringp); - for(i = 0; i < sec_count; i++) + for(int i = 0; i < sec_count; i++) printf("%s (security)\n", secpackages_list[i]); + if (only_critical == false) { - for(i = 0; i < packages_available - sec_count; i++) + for(int i = 0; i < packages_available - sec_count; i++) printf("%s\n", packages_list[i]); } } @@ -320,7 +321,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg * we may need to switch to the --print-uris output format, * in which case the logic here will slightly change. */ - for(i = 0; i < chld_out.lines; i++) { + for(size_t i = 0; i < chld_out.lines; i++) { if(verbose){ printf("%s\n", chld_out.line[i]); } @@ -353,7 +354,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg stderr_warning=1; result = max_state(result, STATE_WARNING); if(verbose){ - for(i = 0; i < chld_err.lines; i++) { + for(size_t i = 0; i < chld_err.lines; i++) { fprintf(stderr, "%s\n", chld_err.line[i]); } } @@ -367,7 +368,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg /* run an apt-get update (needs root) */ int run_update(void){ - int i=0, result=STATE_UNKNOWN; + int result=STATE_UNKNOWN; struct output chld_out, chld_err; char *cmdline; @@ -385,7 +386,7 @@ int run_update(void){ } if(verbose){ - for(i = 0; i < chld_out.lines; i++) { + for(size_t i = 0; i < chld_out.lines; i++) { printf("%s\n", chld_out.line[i]); } } @@ -395,7 +396,7 @@ int run_update(void){ stderr_warning=1; result = max_state(result, STATE_WARNING); if(verbose){ - for(i = 0; i < chld_err.lines; i++) { + for(size_t i = 0; i < chld_err.lines; i++) { fprintf(stderr, "%s\n", chld_err.line[i]); } } -- cgit v1.2.3-74-g34f1 From 81f3b4165146eedd2da60afc5677ec44a0db9829 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:20:27 +0200 Subject: Fix fallout of the previous changes --- plugins/check_apt.c | 2 +- plugins/check_http.c | 2 +- plugins/check_snmp.c | 4 ++-- plugins/check_tcp.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/check_apt.c') diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 290c88ed..5c0f6e28 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -252,7 +252,7 @@ int process_arguments (int argc, char **argv) { /* run an apt-get upgrade */ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkglist){ - int i=0, result=STATE_UNKNOWN, regres=0, pc=0, spc=0; + int result=STATE_UNKNOWN, regres=0, pc=0, spc=0; struct output chld_out, chld_err; regex_t ireg, ereg, sreg; char *cmdline=NULL, rerrbuf[64]; diff --git a/plugins/check_http.c b/plugins/check_http.c index b9d8145c..110f1188 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -471,7 +471,7 @@ bool process_arguments (int argc, char **argv) free(http_method); http_method = strdup (optarg); char *tmp; - if ((tmp = strstr(http_method, ":")) > 0) { + if ((tmp = strstr(http_method, ":")) != NULL) { tmp[0] = '\0'; http_method = http_method; http_method_proxy = ++tmp; diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 01bee231..7ee9d0ca 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -263,7 +263,7 @@ main (int argc, char **argv) previous_string = strdup((char *) previous_state->data); while((ap = strsep(&previous_string, ":")) != NULL) { if(verbose>2) - printf("State for %d=%s\n", i, ap); + printf("State for %zd=%s\n", i, ap); while (i >= previous_size) { previous_size += OID_COUNT_STEP; previous_value = realloc(previous_value, previous_size * sizeof(*previous_value)); @@ -415,7 +415,7 @@ main (int argc, char **argv) break; if (verbose > 2) { - printf("Processing oid %i (line %i)\n oidname: %s\n response: %s\n", i+1, line+1, oidname, response); + printf("Processing oid %zi (line %zi)\n oidname: %s\n response: %s\n", i+1, line+1, oidname, response); } /* Clean up type array - Sol10 does not necessarily zero it out */ diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index c103612a..054f1a39 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -275,7 +275,7 @@ main (int argc, char **argv) } printf("server_expect_count: %d\n", (int)server_expect_count); for(size_t i = 0; i < server_expect_count; i++) - printf("\t%d: %s\n", i, server_expect[i]); + printf("\t%zd: %s\n", i, server_expect[i]); } /* if(len) later on, we know we have a non-NULL response */ -- cgit v1.2.3-74-g34f1