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 (from parent 1:
f882c24
)
core/socket: use _cleanup_free_
author
Shawn Landden
<shawn@churchofgit.com>
Sat, 16 Nov 2013 21:18:12 +0000
(13:18 -0800)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 17 Nov 2013 22:41:35 +0000
(17:41 -0500)
src/core/socket.c
patch
|
blob
|
history
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 03b8f927bb4533066b67fa8479b16e7b93d15f9a..f505e4f9698c3784d581ed72fb455f5c5448fe36 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-1475,7
+1475,7
@@
static void socket_enter_running(Socket *s, int cfd) {
socket_set_state(s, SOCKET_RUNNING);
} else {
socket_set_state(s, SOCKET_RUNNING);
} else {
-
char *prefix, *instance = NULL, *name
;
+
_cleanup_free_ char *prefix = NULL, *instance = NULL, *name = NULL
;
Service *service;
if (s->n_connections >= s->max_connections) {
Service *service;
if (s->n_connections >= s->max_connections) {
@@
-1503,14
+1503,11
@@
static void socket_enter_running(Socket *s, int cfd) {
prefix = unit_name_to_prefix(UNIT(s)->id);
if (!prefix) {
prefix = unit_name_to_prefix(UNIT(s)->id);
if (!prefix) {
- free(instance);
r = -ENOMEM;
goto fail;
}
name = unit_name_build(prefix, instance, ".service");
r = -ENOMEM;
goto fail;
}
name = unit_name_build(prefix, instance, ".service");
- free(prefix);
- free(instance);
if (!name) {
r = -ENOMEM;
if (!name) {
r = -ENOMEM;
@@
-1518,10
+1515,8
@@
static void socket_enter_running(Socket *s, int cfd) {
}
r = unit_add_name(UNIT_DEREF(s->service), name);
}
r = unit_add_name(UNIT_DEREF(s->service), name);
- if (r < 0) {
- free(name);
+ if (r < 0)
goto fail;
goto fail;
- }
service = SERVICE(UNIT_DEREF(s->service));
unit_ref_unset(&s->service);
service = SERVICE(UNIT_DEREF(s->service));
unit_ref_unset(&s->service);
@@
-1530,7
+1525,6
@@
static void socket_enter_running(Socket *s, int cfd) {
UNIT(service)->no_gc = false;
unit_choose_id(UNIT(service), name);
UNIT(service)->no_gc = false;
unit_choose_id(UNIT(service), name);
- free(name);
r = service_set_socket_fd(service, cfd, s);
if (r < 0)
r = service_set_socket_fd(service, cfd, s);
if (r < 0)