summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>2025-09-15 10:46:22 +0200
committerLorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>2025-09-15 10:46:22 +0200
commit67c1aae749196695802070ec7f0634a096e8c70d (patch)
treeb8a22356e8cc30c5586a68c878fb5616a950c608
parenta3cf9041af810770daf5d9b83f1906fa9bb0dd11 (diff)
downloadmonitoring-plugins-67c1aae7.tar.gz
check_apt: improve some variable types to make the linter happy
-rw-r--r--plugins/check_apt.c22
-rw-r--r--plugins/check_apt.d/config.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index e840184b..15febd4d 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -29,11 +29,11 @@
29 * 29 *
30 *****************************************************************************/ 30 *****************************************************************************/
31 31
32#include "states.h"
33const char *progname = "check_apt"; 32const char *progname = "check_apt";
34const char *copyright = "2006-2024"; 33const char *copyright = "2006-2024";
35const char *email = "devel@monitoring-plugins.org"; 34const char *email = "devel@monitoring-plugins.org";
36 35
36#include "states.h"
37#include "common.h" 37#include "common.h"
38#include "runcmd.h" 38#include "runcmd.h"
39#include "utils.h" 39#include "utils.h"
@@ -71,8 +71,8 @@ static int run_update(char * /*update_opts*/);
71 71
72typedef struct { 72typedef struct {
73 int errorcode; 73 int errorcode;
74 int package_count; 74 size_t package_count;
75 int security_package_count; 75 size_t security_package_count;
76 char **packages_list; 76 char **packages_list;
77 char **secpackages_list; 77 char **secpackages_list;
78} run_upgrade_result; 78} run_upgrade_result;
@@ -126,8 +126,8 @@ int main(int argc, char **argv) {
126 run_upgrade(config.upgrade, config.do_include, config.do_exclude, config.do_critical, config.upgrade_opts, config.input_filename); 126 run_upgrade(config.upgrade, config.do_include, config.do_exclude, config.do_critical, config.upgrade_opts, config.input_filename);
127 127
128 result = max_state(result, upgrad_res.errorcode); 128 result = max_state(result, upgrad_res.errorcode);
129 int packages_available = upgrad_res.package_count; 129 size_t packages_available = upgrad_res.package_count;
130 int sec_count = upgrad_res.security_package_count; 130 size_t sec_count = upgrad_res.security_package_count;
131 char **packages_list = upgrad_res.packages_list; 131 char **packages_list = upgrad_res.packages_list;
132 char **secpackages_list = upgrad_res.secpackages_list; 132 char **secpackages_list = upgrad_res.secpackages_list;
133 133
@@ -139,7 +139,7 @@ int main(int argc, char **argv) {
139 result = STATE_UNKNOWN; 139 result = STATE_UNKNOWN;
140 } 140 }
141 141
142 printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s|available_upgrades=%d;;;0 critical_updates=%d;;;0\n"), 142 printf(_("APT %s: %zu packages available for %s (%zu critical updates). %s%s%s%s|available_upgrades=%zu;;;0 critical_updates=%zu;;;0\n"),
143 state_text(result), packages_available, (config.upgrade == DIST_UPGRADE) ? "dist-upgrade" : "upgrade", sec_count, 143 state_text(result), packages_available, (config.upgrade == DIST_UPGRADE) ? "dist-upgrade" : "upgrade", sec_count,
144 (stderr_warning) ? " warnings detected" : "", (stderr_warning && exec_warning) ? "," : "", 144 (stderr_warning) ? " warnings detected" : "", (stderr_warning && exec_warning) ? "," : "",
145 (exec_warning) ? " errors detected" : "", (stderr_warning || exec_warning) ? "." : "", packages_available, sec_count); 145 (exec_warning) ? " errors detected" : "", (stderr_warning || exec_warning) ? "." : "", packages_available, sec_count);
@@ -148,12 +148,12 @@ int main(int argc, char **argv) {
148 qsort(secpackages_list, sec_count, sizeof(char *), cmpstringp); 148 qsort(secpackages_list, sec_count, sizeof(char *), cmpstringp);
149 qsort(packages_list, packages_available - sec_count, sizeof(char *), cmpstringp); 149 qsort(packages_list, packages_available - sec_count, sizeof(char *), cmpstringp);
150 150
151 for (int i = 0; i < sec_count; i++) { 151 for (size_t i = 0; i < sec_count; i++) {
152 printf("%s (security)\n", secpackages_list[i]); 152 printf("%s (security)\n", secpackages_list[i]);
153 } 153 }
154 154
155 if (!config.only_critical) { 155 if (!config.only_critical) {
156 for (int i = 0; i < packages_available - sec_count; i++) { 156 for (size_t i = 0; i < packages_available - sec_count; i++) {
157 printf("%s\n", packages_list[i]); 157 printf("%s\n", packages_list[i]);
158 } 158 }
159 } 159 }
@@ -349,8 +349,8 @@ run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_includ
349 * we may need to switch to the --print-uris output format, 349 * we may need to switch to the --print-uris output format,
350 * in which case the logic here will slightly change. 350 * in which case the logic here will slightly change.
351 */ 351 */
352 int package_counter = 0; 352 size_t package_counter = 0;
353 int security_package_counter = 0; 353 size_t security_package_counter = 0;
354 for (size_t i = 0; i < chld_out.lines; i++) { 354 for (size_t i = 0; i < chld_out.lines; i++) {
355 if (verbose) { 355 if (verbose) {
356 printf("%s\n", chld_out.line[i]); 356 printf("%s\n", chld_out.line[i]);
@@ -520,7 +520,7 @@ char *construct_cmdline(upgrade_type upgrade, const char *opts) {
520 break; 520 break;
521 } 521 }
522 522
523 int len = 0; 523 size_t len = 0;
524 len += strlen(PATH_TO_APTGET) + 1; /* "/usr/bin/apt-get " */ 524 len += strlen(PATH_TO_APTGET) + 1; /* "/usr/bin/apt-get " */
525 len += strlen(opts_ptr) + 1; /* "opts " */ 525 len += strlen(opts_ptr) + 1; /* "opts " */
526 len += strlen(aptcmd) + 1; /* "upgrade\0" */ 526 len += strlen(aptcmd) + 1; /* "upgrade\0" */
diff --git a/plugins/check_apt.d/config.h b/plugins/check_apt.d/config.h
index 981f4f42..7355937b 100644
--- a/plugins/check_apt.d/config.h
+++ b/plugins/check_apt.d/config.h
@@ -16,7 +16,7 @@ typedef struct {
16 bool only_critical; /* whether to warn about non-critical updates */ 16 bool only_critical; /* whether to warn about non-critical updates */
17 bool list; /* list packages available for upgrade */ 17 bool list; /* list packages available for upgrade */
18 /* number of packages available for upgrade to return WARNING status */ 18 /* number of packages available for upgrade to return WARNING status */
19 int packages_warning; 19 size_t packages_warning;
20 20
21 char *upgrade_opts; /* options to override defaults for upgrade */ 21 char *upgrade_opts; /* options to override defaults for upgrade */
22 char *update_opts; /* options to override defaults for update */ 22 char *update_opts; /* options to override defaults for update */