From: Michael Scherer <misc@zarb.org>
Date: Sat, 11 Jan 2014 16:20:57 +0000 (+0100)
Subject: make socket_instantiate_service use cleanup gcc attribute
X-Git-Tag: v209~467
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6c833cdfc36322cf77b83d3154bd216129352a3a

make socket_instantiate_service use cleanup gcc attribute
---

diff --git a/src/core/socket.c b/src/core/socket.c
index 88599ca9c..1f2a2c0aa 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -179,7 +179,8 @@ static int socket_arm_timer(Socket *s) {
 }
 
 static int socket_instantiate_service(Socket *s) {
-        char *prefix, *name;
+        _cleanup_free_ char *prefix = NULL;
+        _cleanup_free_ char *name = NULL;
         int r;
         Unit *u;
 
@@ -199,13 +200,11 @@ static int socket_instantiate_service(Socket *s) {
                 return -ENOMEM;
 
         r = asprintf(&name, "%s@%u.service", prefix, s->n_accepted);
-        free(prefix);
 
         if (r < 0)
                 return -ENOMEM;
 
         r = manager_load_unit(UNIT(s)->manager, name, NULL, NULL, &u);
-        free(name);
 
         if (r < 0)
                 return r;