chiark / gitweb /
make socket_instantiate_service use cleanup gcc attribute
authorMichael Scherer <misc@zarb.org>
Sat, 11 Jan 2014 16:20:57 +0000 (17:20 +0100)
committerTom Gundersen <teg@jklm.no>
Sat, 11 Jan 2014 17:08:39 +0000 (17:08 +0000)
src/core/socket.c

index 88599ca..1f2a2c0 100644 (file)
@@ -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;