From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Tue, 18 Feb 2025 21:20:46 +0000 (+0100)
Subject: tools: use bool instead of int for log_open
X-Git-Tag: v34~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=378fd27803734acc8ed7ce3222feed430b3f945f;p=thirdparty%2Fkmod.git

tools: use bool instead of int for log_open

Since log_open takes a booln as argument, turn use_syslog into a
bool instead of using an int. Shrinks binary size with GCC and from
C point of view, this makes the code cleaner.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Link: https://github.com/kmod-project/kmod/pull/282
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/tools/insmod.c b/tools/insmod.c
index f7916b5f..fef00722 100644
--- a/tools/insmod.c
+++ b/tools/insmod.c
@@ -65,7 +65,7 @@ static int do_insmod(int argc, char *argv[])
 	const char *filename;
 	char *opts = NULL;
 	int verbose = LOG_ERR;
-	int use_syslog = 0;
+	bool use_syslog = false;
 	int c, r = 0;
 	const char *null_config = NULL;
 	unsigned int flags = 0;
@@ -77,7 +77,7 @@ static int do_insmod(int argc, char *argv[])
 			flags |= KMOD_PROBE_FORCE_VERMAGIC;
 			break;
 		case 's':
-			use_syslog = 1;
+			use_syslog = true;
 			break;
 		case 'v':
 			verbose++;
diff --git a/tools/lsmod.c b/tools/lsmod.c
index ea68d1dc..4ece1fbd 100644
--- a/tools/lsmod.c
+++ b/tools/lsmod.c
@@ -44,13 +44,13 @@ static int do_lsmod(int argc, char *argv[])
 	const char *null_config = NULL;
 	struct kmod_list *list, *itr;
 	int verbose = LOG_ERR;
-	int use_syslog = 0;
+	bool use_syslog = false;
 	int err, c, r = 0;
 
 	while ((c = getopt_long(argc, argv, cmdopts_s, cmdopts, NULL)) != -1) {
 		switch (c) {
 		case 's':
-			use_syslog = 1;
+			use_syslog = true;
 			break;
 		case 'v':
 			verbose++;
diff --git a/tools/modprobe.c b/tools/modprobe.c
index ec66e6fc..79c9fe1d 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -28,7 +28,7 @@
 #include "kmod.h"
 
 static int log_priority = LOG_CRIT;
-static int use_syslog = 0;
+static bool use_syslog = false;
 #define LOG(...) log_printf(log_priority, __VA_ARGS__)
 
 #define DEFAULT_VERBOSE LOG_WARNING
@@ -861,7 +861,7 @@ static int do_modprobe(int argc, char **orig_argv)
 			break;
 		case 's':
 			env_modprobe_options_append("-s");
-			use_syslog = 1;
+			use_syslog = true;
 			break;
 		case 'q':
 			env_modprobe_options_append("-q");
@@ -894,7 +894,7 @@ static int do_modprobe(int argc, char **orig_argv)
 
 	if (!use_syslog &&
 	    (!stderr || fileno(stderr) == -1 || fstat(fileno(stderr), &stat_buf)))
-		use_syslog = 1;
+		use_syslog = true;
 
 	log_open(use_syslog);
 
diff --git a/tools/rmmod.c b/tools/rmmod.c
index 0e00edec..962d8505 100644
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -94,7 +94,7 @@ static int do_rmmod(int argc, char *argv[])
 	struct kmod_ctx *ctx;
 	const char *null_config = NULL;
 	int verbose = LOG_ERR;
-	int use_syslog = 0;
+	bool use_syslog = false;
 	int flags = 0;
 	int i, c, r = 0;
 
@@ -104,7 +104,7 @@ static int do_rmmod(int argc, char *argv[])
 			flags |= KMOD_REMOVE_FORCE;
 			break;
 		case 's':
-			use_syslog = 1;
+			use_syslog = true;
 			break;
 		case 'v':
 			verbose++;