From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 22 Aug 2018 10:46:37 +0000 (+0900)
Subject: libudev-util: drop unnecessary argument 'struct udev *udev' from util_resolve_subsys_... 
X-Git-Tag: v240~725^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=755c3fe9a7f4f81e0bebd8b0fafc45bbd6b2499b;p=thirdparty%2Fsystemd.git

libudev-util: drop unnecessary argument 'struct udev *udev' from util_resolve_subsys_kernel()
---

diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
index af24b7b4233..1a83de4eed5 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/libudev-private.h
@@ -125,9 +125,7 @@ int util_replace_whitespace(const char *str, char *to, size_t len);
 int util_replace_chars(char *str, const char *white);
 unsigned int util_string_hash32(const char *key);
 uint64_t util_string_bloom64(const char *str);
-
-/* libudev-util-private.c */
-int util_resolve_subsys_kernel(struct udev *udev, const char *string, char *result, size_t maxsize, int read_value);
+int util_resolve_subsys_kernel(const char *string, char *result, size_t maxsize, int read_value);
 
 /* Cleanup functions */
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref);
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index f80af9705e8..1cc7bd66125 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -23,9 +23,8 @@
  */
 
 /* handle "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
-int util_resolve_subsys_kernel(struct udev *udev, const char *string,
-                               char *result, size_t maxsize, int read_value)
-{
+int util_resolve_subsys_kernel(const char *string,
+                               char *result, size_t maxsize, int read_value) {
         char temp[UTIL_PATH_SIZE];
         char *subsys;
         char *sysname;
@@ -58,7 +57,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
         if (read_value && attr == NULL)
                 return -1;
 
-        dev = udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
+        dev = udev_device_new_from_subsystem_sysname(NULL, subsys, sysname);
         if (dev == NULL)
                 return -1;
 
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 541aac2c3fa..863a93a10ba 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -180,7 +180,7 @@ static size_t subst_format_var(struct udev_event *event, struct udev_device *dev
                 }
 
                 /* try to read the value specified by "[dmi/id]product_name" */
-                if (util_resolve_subsys_kernel(event->udev, attr, vbuf, sizeof(vbuf), 1) == 0)
+                if (util_resolve_subsys_kernel(attr, vbuf, sizeof(vbuf), 1) == 0)
                         value = vbuf;
 
                 /* try to read the attribute the device */
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 58ce71c7940..bc2fb5cfda7 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1690,7 +1690,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
                         return -1;
                 break;
         case SB_SUBSYS:
-                if (util_resolve_subsys_kernel(event->udev, name, vbuf, sizeof(vbuf), 1) != 0)
+                if (util_resolve_subsys_kernel(name, vbuf, sizeof(vbuf), 1) != 0)
                         return -1;
                 value = vbuf;
                 break;
@@ -1923,7 +1923,7 @@ void udev_rules_apply_to_event(struct udev_rules *rules,
                         int match;
 
                         udev_event_apply_format(event, rules_str(rules, cur->key.value_off), filename, sizeof(filename), false);
-                        if (util_resolve_subsys_kernel(event->udev, filename, filename, sizeof(filename), 0) != 0) {
+                        if (util_resolve_subsys_kernel(filename, filename, sizeof(filename), 0) != 0) {
                                 if (filename[0] != '/') {
                                         char tmp[UTIL_PATH_SIZE];
 
@@ -2356,7 +2356,7 @@ void udev_rules_apply_to_event(struct udev_rules *rules,
                         char value[UTIL_NAME_SIZE];
                         _cleanup_fclose_ FILE *f = NULL;
 
-                        if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0)
+                        if (util_resolve_subsys_kernel(key_name, attr, sizeof(attr), 0) != 0)
                                 strscpyl(attr, sizeof(attr), udev_device_get_syspath(event->dev), "/", key_name, NULL);
                         attr_subst_subdir(attr, sizeof(attr));