X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Fsysfs-show.c;h=3286411de88b7637ad24d5dac4c45e7da53e0321;hp=05cb787a68b04219fc11c1e94e20c76b0497bcba;hb=06acf2d46a38bec212d78094e6ef8b100679048a;hpb=e120204729764f6243b60899eb907103e678bee2

diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index 05cb787a6..3286411de 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -42,10 +42,10 @@ static int show_sysfs_one(
         assert(prefix);
 
         while (*item) {
+                _cleanup_udev_device_unref_ struct udev_device *d = NULL;
                 struct udev_list_entry *next, *lookahead;
-                struct udev_device *d;
                 const char *sn, *name, *sysfs, *subsystem, *sysname;
-                char *l, *k;
+                _cleanup_free_ char *k = NULL, *l = NULL;
                 bool is_master;
 
                 sysfs = udev_list_entry_get_name(*item);
@@ -64,7 +64,6 @@ static int show_sysfs_one(
 
                 /* Explicitly also check for tag 'seat' here */
                 if (!streq(seat, sn) || !udev_device_has_tag(d, "seat")) {
-                        udev_device_unref(d);
                         *item = udev_list_entry_get_next(*item);
                         continue;
                 }
@@ -86,21 +85,17 @@ static int show_sysfs_one(
 
                         if (path_startswith(lookahead_sysfs, sub) &&
                             !path_startswith(lookahead_sysfs, sysfs)) {
-                                struct udev_device *lookahead_d;
+                                _cleanup_udev_device_unref_ struct udev_device *lookahead_d = NULL;
 
                                 lookahead_d = udev_device_new_from_syspath(udev, lookahead_sysfs);
                                 if (lookahead_d) {
                                         const char *lookahead_sn;
-                                        bool found;
 
                                         lookahead_sn = udev_device_get_property_value(d, "ID_SEAT");
                                         if (isempty(lookahead_sn))
                                                 lookahead_sn = "seat0";
 
-                                        found = streq(seat, lookahead_sn) && udev_device_has_tag(lookahead_d, "seat");
-                                        udev_device_unref(lookahead_d);
-
-                                        if (found)
+                                        if (streq(seat, lookahead_sn) && udev_device_has_tag(lookahead_d, "seat"))
                                                 break;
                                 }
                         }
@@ -109,43 +104,43 @@ static int show_sysfs_one(
                 }
 
                 k = ellipsize(sysfs, n_columns, 20);
-                printf("%s%s%s\n", prefix, draw_special_char(lookahead ? DRAW_TREE_BRANCH : DRAW_TREE_RIGHT),
-                                   k ? k : sysfs);
-                free(k);
+                if (!k)
+                        return -ENOMEM;
+
+                printf("%s%s%s\n", prefix, draw_special_char(lookahead ? DRAW_TREE_BRANCH : DRAW_TREE_RIGHT), k);
 
                 if (asprintf(&l,
                              "%s%s:%s%s%s%s",
                              is_master ? "[MASTER] " : "",
                              subsystem, sysname,
-                             name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
-                        udev_device_unref(d);
+                             name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0)
                         return -ENOMEM;
-                }
 
-                k = ellipsize(l, n_columns, 70);
-                printf("%s%s%s\n", prefix, lookahead ? draw_special_char(DRAW_TREE_VERT) : "  ",
-                                   k ? k : l);
                 free(k);
-                free(l);
+                k = ellipsize(l, n_columns, 70);
+                if (!k)
+                        return -ENOMEM;
+
+                printf("%s%s%s\n", prefix, lookahead ? draw_special_char(DRAW_TREE_VERT) : "  ", k);
 
                 *item = next;
                 if (*item) {
-                        char *p;
+                        _cleanup_free_ char *p = NULL;
 
                         p = strappend(prefix, lookahead ? draw_special_char(DRAW_TREE_VERT) : "  ");
-                        show_sysfs_one(udev, seat, item, sysfs, p ? p : prefix, n_columns - 2);
-                        free(p);
-                }
+                        if (!p)
+                                return -ENOMEM;
 
-                udev_device_unref(d);
+                        show_sysfs_one(udev, seat, item, sysfs, p, n_columns - 2);
+                }
         }
 
         return 0;
 }
 
 int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
-        _cleanup_udev_unref_ struct udev *udev;
         _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
+        _cleanup_udev_unref_ struct udev *udev = NULL;
         struct udev_list_entry *first = NULL;
         int r;