Module: monitoring-plugins
Branch: master
Commit: e2f24a5af3fe407035c8c57f539148f2d694973b
Author: RincewindsHat <12514511+rincewinds...@users.noreply.github.com>
Date: Wed Nov 24 14:25:42 2021 +0100
URL:
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=e2f24a5
Fix CodeQL checks
---
plugins-root/check_icmp.c | 4 ++--
plugins/check_disk.c | 16 ++++++++++------
plugins/check_hpjd.c | 2 +-
plugins/check_swap.c | 2 +-
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 519b93c..bcf6c5f 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -502,7 +502,7 @@ main(int argc, char **argv)
icmp_data_size = size;
icmp_pkt_size = size + ICMP_MINLEN;
} else
- usage_va("ICMP data length must be
between: %d and %d",
+ usage_va("ICMP data length must be
between: %ul and %ul",
sizeof(struct icmp) +
sizeof(struct icmp_ping_data),
MAX_PING_DATA - 1);
break;
@@ -1293,7 +1293,7 @@ add_target_ip(char *arg, struct sockaddr_storage *in)
if(!host) {
char straddr[INET6_ADDRSTRLEN];
parse_address((struct sockaddr_storage*)&in, straddr,
sizeof(straddr));
- crash("add_target_ip(%s, %s): malloc(%d) failed",
+ crash("add_target_ip(%s, %s): malloc(%ul) failed",
arg, straddr, sizeof(struct rta_host));
}
memset(host, 0, sizeof(struct rta_host));
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index c526d05..f032378 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1040,9 +1040,15 @@ get_stats (struct parameter_list *p, struct fs_usage
*fsp) {
get_fs_usage (p_list->best_match->me_mountdir,
p_list->best_match->me_devname, &tmpfsp);
get_path_stats(p_list, &tmpfsp);
if (verbose >= 3)
- printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g
free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n",
- p_list->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize,
p_list->best_match->me_mountdir, p_list->dused_units, p_list->dfree_units,
- p_list->dtotal_units, mult);
+ printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g
free_units=%g total_units=%g mult=%llu\n",
+ p_list->group,
+ tmpfsp.fsu_blocks,
+ tmpfsp.fsu_blocksize,
+ p_list->best_match->me_mountdir,
+ p_list->dused_units,
+ p_list->dfree_units,
+ p_list->dtotal_units,
+ mult);
/* prevent counting the first FS of a group twice since its
parameter_list entry
* is used to carry the information of all file systems of the entire
group */
@@ -1065,12 +1071,10 @@ get_stats (struct parameter_list *p, struct fs_usage
*fsp) {
if (verbose >= 3)
printf("Group %s now has: used_units=%g free_units=%g total_units=%g
fsu_blocksize=%llu mult=%llu\n",
p->group,
- tmpfsp.fsu_bavail,
- tmpfsp.fsu_blocksize,
- p->best_match->me_mountdir,
p->dused_units,
p->dfree_units,
p->dtotal_units,
+ tmpfsp.fsu_blocksize,
mult);
}
/* modify devname and mountdir for output */
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 6546556..d3d72d7 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -121,7 +121,7 @@ main (int argc, char **argv)
HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT,
HPJD_GD_STATUS_DISPLAY);
/* get the command to run */
- sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%hd %s",
PATH_TO_SNMPGET, community,
+ sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%s %s",
PATH_TO_SNMPGET, community,
address, port, query_string);
/* run the command */
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 7f71bf7..00bdcdd 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -142,7 +142,7 @@ main (int argc, char **argv)
percent = 100 * (((double) dskused_mb)
/ ((double) dsktotal_mb));
result = max_state (result, check_swap
(dskfree_mb, dsktotal_mb));
if (verbose)
- xasprintf (&status, "%s [%.0f (%d%%)]",
status, dskfree_mb, 100 - percent);
+ xasprintf (&status, "%s [%ul (%d%%)]",
status, dskfree_mb, 100 - percent);
}
}
/*
