From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 18 Sep 2024 15:49:08 +0000 (+0100)
Subject: tools: add kmod_version() helper
X-Git-Tag: v34~320
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b644b8d784d17405a5e6da541cc337f7fd07f90d;p=thirdparty%2Fkmod.git

tools: add kmod_version() helper

Add a trivial helper that prints the version + features combo. I will be
adding another instance of those, so I'm aiming to keep the boilerplate
code to a minimum.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/138
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/tools/depmod.c b/tools/depmod.c
index 863e7fc9..847b4cb5 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -3026,8 +3026,7 @@ static int do_depmod(int argc, char *argv[])
 			help();
 			return EXIT_SUCCESS;
 		case 'V':
-			puts(PACKAGE " version " VERSION);
-			puts(KMOD_FEATURES);
+			kmod_version();
 			return EXIT_SUCCESS;
 		case '?':
 			goto cmdline_failed;
diff --git a/tools/insmod.c b/tools/insmod.c
index 9323fffc..94452ffa 100644
--- a/tools/insmod.c
+++ b/tools/insmod.c
@@ -77,8 +77,7 @@ static int do_insmod(int argc, char *argv[])
 			help();
 			return EXIT_SUCCESS;
 		case 'V':
-			puts(PACKAGE " version " VERSION);
-			puts(KMOD_FEATURES);
+			kmod_version();
 			return EXIT_SUCCESS;
 		case '?':
 			return EXIT_FAILURE;
diff --git a/tools/kmod.c b/tools/kmod.c
index 9195ec88..4d115802 100644
--- a/tools/kmod.c
+++ b/tools/kmod.c
@@ -97,8 +97,7 @@ static int handle_kmod_commands(int argc, char *argv[])
 			kmod_help(argc, argv);
 			return EXIT_SUCCESS;
 		case 'V':
-			puts(PACKAGE " version " VERSION);
-			puts(KMOD_FEATURES);
+			kmod_version();
 			return EXIT_SUCCESS;
 		case '?':
 			return EXIT_FAILURE;
diff --git a/tools/kmod.h b/tools/kmod.h
index c3c8683b..be85ec1c 100644
--- a/tools/kmod.h
+++ b/tools/kmod.h
@@ -25,4 +25,10 @@ extern const struct kmod_cmd kmod_cmd_list;
 extern const struct kmod_cmd kmod_cmd_static_nodes;
 extern const struct kmod_cmd kmod_cmd_remove;
 
+static inline void kmod_version(void)
+{
+	puts(PACKAGE " version " VERSION);
+	puts(KMOD_FEATURES);
+}
+
 #include "log.h"
diff --git a/tools/modinfo.c b/tools/modinfo.c
index c91946c6..59ecb17e 100644
--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -423,8 +423,7 @@ static int do_modinfo(int argc, char *argv[])
 			help();
 			return EXIT_SUCCESS;
 		case 'V':
-			puts(PACKAGE " version " VERSION);
-			puts(KMOD_FEATURES);
+			kmod_version();
 			return EXIT_SUCCESS;
 		case '?':
 			return EXIT_FAILURE;
diff --git a/tools/modprobe.c b/tools/modprobe.c
index c74afbb4..3c085e89 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -938,8 +938,7 @@ static int do_modprobe(int argc, char **orig_argv)
 			verbose++;
 			break;
 		case 'V':
-			puts(PACKAGE " version " VERSION);
-			puts(KMOD_FEATURES);
+			kmod_version();
 			err = 0;
 			goto done;
 		case 'h':
diff --git a/tools/rmmod.c b/tools/rmmod.c
index c353fdbf..9761aefe 100644
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -120,8 +120,7 @@ static int do_rmmod(int argc, char *argv[])
 			help();
 			return EXIT_SUCCESS;
 		case 'V':
-			puts(PACKAGE " version " VERSION);
-			puts(KMOD_FEATURES);
+			kmod_version();
 			return EXIT_SUCCESS;
 		case '?':
 			return EXIT_FAILURE;