chore(src): properly initialize udev_match by key.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
FedeDP · Jun 8, 2023 · 695bf5d · 695bf5d
1 parent 473f19d
commit 695bf5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/modules/sensors/als.c b/src/modules/sensors/als.c
@@ -27,7 +27,7 @@ static void fetch_dev(const char *interface, void **dev) {
     /* Check if any device exposes requested sysattr */
     for (int i = 0; i < SIZE(ill_names) && !*dev; i++) {
         /* Only check existence for needed sysattr */
-        const udev_match match = { ill_names[i] };
+        const udev_match match = { .sysattr_key = ill_names[i] };
         get_udev_device(interface, ALS_SUBSYSTEM, &match, NULL, (struct udev_device **)dev);
     }
 }

diff --git a/src/modules/sensors/yoctolight.c b/src/modules/sensors/yoctolight.c
@@ -144,7 +144,7 @@ static bool validate_dev(void *dev) {
 }
 
 static void fetch_dev(const char *interface, void **dev) {
-    const udev_match match = { YOCTO_PROPERTY, YOCTO_VENDORID };
+    const udev_match match = { .sysattr_key = YOCTO_PROPERTY, .sysattr_val = YOCTO_VENDORID };
     get_udev_device(interface, YOCTO_SUBSYSTEM, &match, NULL, (struct udev_device **)dev);
 }
 

diff --git a/src/utils/udev.c b/src/utils/udev.c
@@ -18,8 +18,12 @@ static void get_first_matching_device(struct udev_device **dev, const char *subs
     udev_enumerate_add_match_subsystem(enumerate, subsystem);
     bool last_added =false;
     if (match) {
-        udev_enumerate_add_match_sysattr(enumerate, match->sysattr_key, match->sysattr_val);
-        udev_enumerate_add_match_property(enumerate, match->prop_key, match->prop_val);
+        if (match->sysattr_key) {
+            udev_enumerate_add_match_sysattr(enumerate, match->sysattr_key, match->sysattr_val);
+        }
+        if (match->prop_key) {
+            udev_enumerate_add_match_property(enumerate, match->prop_key, match->prop_val);
+        }
         last_added = match->last_added;
     }
     udev_enumerate_scan_devices(enumerate);