From f171decd3f05573efc5420db0c1630969fde67a0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 26 Mar 2019 17:19:47 +0100 Subject: [PATCH] terminal-util: modernize things with TAKE_PTR a bit --- src/basic/terminal-util.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index ab8917ccc5c..a1a789984f0 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -912,20 +912,18 @@ int getttyname_malloc(int fd, char **ret) { return 0; } -int getttyname_harder(int fd, char **r) { - int k; - char *s = NULL; +int getttyname_harder(int fd, char **ret) { + _cleanup_free_ char *s = NULL; + int r; - k = getttyname_malloc(fd, &s); - if (k < 0) - return k; + r = getttyname_malloc(fd, &s); + if (r < 0) + return r; - if (streq(s, "tty")) { - free(s); - return get_ctty(0, NULL, r); - } + if (streq(s, "tty")) + return get_ctty(0, NULL, ret); - *r = s; + *ret = TAKE_PTR(s); return 0; } -- 2.39.2