summaryrefslogtreecommitdiff
path: root/src/initctl
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2023-04-21 15:34:11 +0200
committerDavid Tardon <dtardon@redhat.com>2023-04-27 21:42:38 +0200
commit0a956e8e02b60329ff683db27369cbfdabf477aa (patch)
treea88fcc780ff899b979aa220da3a36a88389c17e5 /src/initctl
parent70bbf65942a35dc493b2efbe9f8112e394a45b82 (diff)
downloadsystemd-0a956e8e02b60329ff683db27369cbfdabf477aa.tar.gz
initctl: use _cleanup_
Diffstat (limited to 'src/initctl')
-rw-r--r--src/initctl/initctl.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index b7fd215acd..d1b7c30562 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -284,7 +284,7 @@ static int server_init(Server *s, unsigned n_sockets) {
static int process_event(Server *s, struct epoll_event *ev) {
int r;
- Fifo *f;
+ _cleanup_(fifo_freep) Fifo *f = NULL;
assert(s);
assert(ev);
@@ -295,11 +295,10 @@ static int process_event(Server *s, struct epoll_event *ev) {
f = (Fifo*) ev->data.ptr;
r = fifo_process(f);
- if (r < 0) {
- log_info_errno(r, "Got error on fifo: %m");
- fifo_free(f);
- return r;
- }
+ if (r < 0)
+ return log_info_errno(r, "Got error on fifo: %m");
+
+ TAKE_PTR(f);
return 0;
}