From 0a956e8e02b60329ff683db27369cbfdabf477aa Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 21 Apr 2023 15:34:11 +0200 Subject: [PATCH] initctl: use _cleanup_ --- src/initctl/initctl.c | 11 +++++------ 1 file 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; }