From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 25 Apr 2023 10:52:26 +0000 (+0900)
Subject: udev: use version()
X-Git-Tag: v254-rc1~630
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22148897cfa5cf06c19cead3d917e00721cb39cc;p=thirdparty%2Fsystemd.git

udev: use version()

Fixes #27382.
---

diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c
index dd46113137c..37c098adc86 100644
--- a/src/udev/dmi_memory_id/dmi_memory_id.c
+++ b/src/udev/dmi_memory_id/dmi_memory_id.c
@@ -51,7 +51,6 @@
 #include "string-util.h"
 #include "udev-util.h"
 #include "unaligned.h"
-#include "version.h"
 
 #define SUPPORTED_SMBIOS_VER 0x030300
 
@@ -663,8 +662,7 @@ static int parse_argv(int argc, char * const *argv) {
                         arg_source_file = optarg;
                         break;
                 case 'V':
-                        printf("%s\n", GIT_VERSION);
-                        return 0;
+                        return version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index e7d8da7c50f..6308c52b7ec 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -16,6 +16,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "device-nodes.h"
 #include "extract-word.h"
 #include "fd-util.h"
@@ -26,7 +27,6 @@
 #include "strv.h"
 #include "strxcpyx.h"
 #include "udev-util.h"
-#include "version.h"
 
 static const struct option options[] = {
         { "device",             required_argument, NULL, 'd' },
@@ -297,7 +297,7 @@ static int set_options(int argc, char **argv,
                         break;
 
                 case 'V':
-                        printf("%s\n", GIT_VERSION);
+                        version();
                         exit(EXIT_SUCCESS);
 
                 case 'x':