udev: replace ARRAY_SIZE() with ELEMENTSOF()

[elogind.git] / src / udev / udevadm-info.c

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index ee9b59fea878c1fa0b28685b361610650c0d6db1..39221b7374305319c9c78ff586cddcd792256497 100644 (file)
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -44,7 +44,7 @@ static bool skip_attribute(const char *name)
         };
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(skip); i++)
+        for (i = 0; i < ELEMENTSOF(skip); i++)
                 if (strcmp(name, skip[i]) == 0)
                         return true;
         return false;
@@ -52,7 +52,6 @@ static bool skip_attribute(const char *name)
 
 static void print_all_attributes(struct udev_device *device, const char *key)
 {
-        struct udev *udev = udev_device_get_udev(device);
         struct udev_list_entry *sysattr;
 
         udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(device)) {
@@ -67,7 +66,6 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                 value = udev_device_get_sysattr_value(device, name);
                 if (value == NULL)
                         continue;
-                dbg(udev, "attr '%s'='%s'\n", name, value);
 
                 /* skip any values that look like a path */
                 if (value[0] == '/')
@@ -77,10 +75,8 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                 len = strlen(value);
                 while (len > 0 && isprint(value[len-1]))
                         len--;
-                if (len > 0) {
-                        dbg(udev, "attribute value of '%s' non-printable, skip\n", name);
+                if (len > 0)
                         continue;
-                }
 
                 printf("    %s{%s}==\"%s\"\n", key, name, value);
         }
@@ -332,7 +328,6 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                 if (option == -1)
                         break;
 
-                dbg(udev, "option '%c'\n", option);
                 switch (option) {
                 case 'n':
                         if (device != NULL) {