]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udevadm-info: drop args of stat_device()
authorDavid Tardon <dtardon@redhat.com>
Fri, 25 Apr 2025 12:56:35 +0000 (14:56 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 9 May 2025 03:14:21 +0000 (12:14 +0900)
They are all static vars now, so can be used directly.

src/udev/udevadm-info.c

index 17fd33f45c62a3ff10cec20a91e8a7f1ed3e7065..f7cbfa487879d857fe0b915a8fb91acad1b9c2c9 100644 (file)
@@ -450,17 +450,16 @@ static int record_to_json(sd_device *device, sd_json_variant **ret) {
         return 0;
 }
 
-static int stat_device(const char *name, bool export, const char *prefix) {
+static int stat_device(void) {
         struct stat statbuf;
 
-        assert(name);
+        assert(arg_name);
 
-        if (stat(name, &statbuf) != 0)
+        if (stat(arg_name, &statbuf) != 0)
                 return -errno;
 
-        if (export) {
-                if (!prefix)
-                        prefix = "INFO_";
+        if (arg_export) {
+                const char *prefix = arg_export_prefix ?: "INFO_";
                 printf("%sMAJOR=%u\n"
                        "%sMINOR=%u\n",
                        prefix, major(statbuf.st_dev),
@@ -1284,7 +1283,7 @@ int info_main(int argc, char *argv[], void *userdata) {
                 return cleanup_db();
 
         if (arg_action_type == ACTION_DEVICE_ID_FILE)
-                return stat_device(arg_name, arg_export, arg_export_prefix);
+                return stat_device();
 
         pager_open(arg_pager_flags);