From e2f24a5af3fe407035c8c57f539148f2d694973b Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Wed, 24 Nov 2021 14:25:42 +0100
Subject: Fix CodeQL checks

---
 plugins/check_hpjd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/check_hpjd.c')

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 65465567..d3d72d7e 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 */
-- 
cgit v1.2.3-74-g34f1


From 40d4e8a057a77e357c26d701c5fd304b51787b93 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Wed, 24 Nov 2021 15:38:18 +0100
Subject: check_hpjd: Fixing port option

---
 plugins/check_hpjd.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'plugins/check_hpjd.c')

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index d3d72d7e..c4b44178 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -66,7 +66,7 @@ void print_usage (void);
 
 char *community = NULL;
 char *address = NULL;
-char *port = NULL;
+unsigned int port = 0;
 int  check_paper_out = 1;
 
 int
@@ -121,8 +121,12 @@ 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:%s %s", PATH_TO_SNMPGET, community,
-									address, port, query_string);
+	sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s",
+			PATH_TO_SNMPGET,
+			community,
+			address,
+			port,
+			query_string);
 
 	/* run the command */
 	child_process = spopen (command_line);
@@ -380,11 +384,8 @@ process_arguments (int argc, char **argv)
 			community = strdup (DEFAULT_COMMUNITY);
 	}
 
-	if (port == NULL) {
-		if (argv[c] != NULL )
-			port = argv[c];
-		else
-			port = atoi (DEFAULT_PORT);
+	if (port == 0) {
+		port = atoi(DEFAULT_PORT);
 	}
 
 	return validate_arguments ();
-- 
cgit v1.2.3-74-g34f1


From f7687d47cb0841d0bc12ef205fcbaef8bf2e3805 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Sun, 12 Mar 2023 19:56:43 +0100
Subject: Fixes for -Wimplicit-fallthrough

---
 plugins/check_curl.c  | 1 +
 plugins/check_dbi.c   | 1 +
 plugins/check_fping.c | 1 +
 plugins/check_hpjd.c  | 1 +
 plugins/check_http.c  | 1 +
 plugins/check_smtp.c  | 1 +
 plugins/check_snmp.c  | 1 +
 7 files changed, 7 insertions(+)

(limited to 'plugins/check_hpjd.c')

diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index be5740d7..b7137145 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -1654,6 +1654,7 @@ process_arguments (int argc, char **argv)
       break;
     case 'R': /* regex */
       cflags |= REG_ICASE;
+			// fall through
     case 'r': /* regex */
       strncpy (regexp, optarg, MAX_RE_SIZE - 1);
       regexp[MAX_RE_SIZE - 1] = 0;
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index ced13d05..d73efbb2 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -426,6 +426,7 @@ process_arguments (int argc, char **argv)
 			else
 				timeout_interval = atoi (optarg);
 
+			break;
 		case 'H':     /* host */
 			if (!is_host (optarg))
 				usage2 (_("Invalid hostname/address"), optarg);
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 6f5656ef..23a9e990 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -354,6 +354,7 @@ process_arguments (int argc, char **argv)
       break;
     case 'I':                 /* sourceip */
       sourceif = strscpy (sourceif, optarg);
+			break;
     case '4':                 /* IPv4 only */
       address_family = AF_INET;
       break;
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index c4b44178..c34bb082 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -353,6 +353,7 @@ process_arguments (int argc, char **argv)
 				usage2 (_("Port must be a positive short integer"), optarg);
 			else
 				port = atoi(optarg);
+			break;
 		case 'D':									/* disable paper out check*/
 			check_paper_out = 0;
 			break;
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 8c03bc8b..432a984b 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -498,6 +498,7 @@ bool process_arguments (int argc, char **argv)
       break;
     case 'R': /* regex */
       cflags |= REG_ICASE;
+			// fall through
     case 'r': /* regex */
       strncpy (regexp, optarg, MAX_RE_SIZE - 1);
       regexp[MAX_RE_SIZE - 1] = 0;
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index eaa7eeba..b035aab5 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -616,6 +616,7 @@ process_arguments (int argc, char **argv)
 #else
 			usage (_("SSL support not available - install OpenSSL and recompile"));
 #endif
+			// fall through
 		case 'S':
 		/* starttls */
 			use_ssl = TRUE;
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index c425df3c..04dc6c6f 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -855,6 +855,7 @@ process_arguments (int argc, char **argv)
 			break;
 		case 'R':									/* regex */
 			cflags = REG_ICASE;
+			// fall through
 		case 'r':									/* regex */
 			cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
 			strncpy (regex_expect, optarg, sizeof (regex_expect) - 1);
-- 
cgit v1.2.3-74-g34f1