From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 28 Nov 2017 12:26:15 +0000 (+0100)
Subject: udev/collect: use _cleanup_ in one more place
X-Git-Tag: v236~99^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae34a10bac21a9d2b004755163a039a3a6e73c7d;p=platform%2Fupstream%2Fsystemd.git

udev/collect: use _cleanup_ in one more place

This doesn't make the code pretty, but it at least makes it a tiny bit shorter.
---

diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 975842b..14e97e6 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -135,7 +135,8 @@ static int prepare(char *dir, char *filename)
 static int checkout(int fd)
 {
         int len;
-        char *buf, *ptr, *word = NULL;
+        _cleanup_free_ char *buf = NULL;
+        char *ptr, *word = NULL;
         struct _mate *him;
 
  restart:
@@ -155,7 +156,6 @@ static int checkout(int fd)
                                 bufsize = bufsize << 1;
                                 if (debug)
                                         fprintf(stderr, "ID overflow, restarting with size %zu\n", bufsize);
-                                free(buf);
                                 lseek(fd, 0, SEEK_SET);
                                 goto restart;
                         }
@@ -168,13 +168,10 @@ static int checkout(int fd)
                                 if (debug)
                                         fprintf(stderr, "Found word %s\n", word);
                                 him = malloc(sizeof (struct _mate));
-                                if (!him) {
-                                        free(buf);
+                                if (!him)
                                         return log_oom();
-                                }
                                 him->name = strdup(word);
                                 if (!him->name) {
-                                        free(buf);
                                         free(him);
                                         return log_oom();
                                 }
@@ -191,7 +188,6 @@ static int checkout(int fd)
                 ptr -= len;
         }
 
-        free(buf);
         return 0;
 }