udev-builtin-net_id: various coding style cleanups

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index b8b8bfae362138a115da952fa4fa1527816a6a75..4936ba518a07540d0b795b62b023b7d771824e71 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -299,6 +299,8 @@ static int is_pci_multifunction(sd_device *dev) {
         size_t len;
         int r;
 
+        assert(dev);
+
         r = sd_device_get_syspath(dev, &syspath);
         if (r < 0)
                 return r;
@@ -319,17 +321,16 @@ static int is_pci_multifunction(sd_device *dev) {
 }
 
 static bool is_pci_ari_enabled(sd_device *dev) {
-        const char *a;
-
-        if (sd_device_get_sysattr_value(dev, "ari_enabled", &a) < 0)
-                return false;
+        assert(dev);
 
-        return streq(a, "1");
+        return device_get_sysattr_bool(dev, "ari_enabled") > 0;
 }
 
 static bool is_pci_bridge(sd_device *dev) {
         const char *v, *p;
 
+        assert(dev);
+
         if (sd_device_get_sysattr_value(dev, "modalias", &v) < 0)
                 return false;