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 863e7fc9d65484e23dea4849e36d17e7f30f40b1..847b4cb5916562488a55f641fa699ac58b01f4e4 100644 (file)
--- 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 9323fffc79a400d95a7c836324289eab0c5eeef8..94452ffa5eb19b218bdd7fd2d6a28eb5887193f9 100644 (file)
--- 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 9195ec885642ddfcbdf5ec7ada9032efbb0b6ed4..4d1158028619f1a9b240a6f8f82ff55830762289 100644 (file)
--- 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 c3c8683bd0e0c57aef359d2bc816b04eb536c00c..be85ec1ce13383535fae5390b124c7c272c357cf 100644 (file)
--- 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 c91946c66460341ade1968dfac68a50dab7b367d..59ecb17e2ffd46b587dfee69893c82f895170fc7 100644 (file)
--- 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 c74afbb41d84fbc5f99c6aacde02318cb77da0c7..3c085e89a6539105290ec135cd4601b89f5f45f0 100644 (file)
--- 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 c353fdbfdb3911df67cfa0f42298d94d7d881155..9761aefe9393dd0f207e715e48fce6dd7223d865 100644 (file)
--- 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;