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 <[email protected]> Link: #138 Signed-off-by: Lucas De Marchi <[email protected]>
kmod-project · Sep 21, 2024 · b644b8d · b644b8d
1 parent 6eef551
commit b644b8d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;