chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec260ed
)
make socket_instantiate_service use cleanup gcc attribute
author
Michael Scherer
<misc@zarb.org>
Sat, 11 Jan 2014 16:20:57 +0000
(17:20 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Sat, 11 Jan 2014 17:08:39 +0000
(17:08 +0000)
src/core/socket.c
patch
|
blob
|
history
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 88599ca9c164a25ad33c049f802a571a9c7224a7..1f2a2c0aaf34e62a2bf5eec503cc808def88cd86 100644
(file)
--- 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;