diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-03-26 17:19:47 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-03-27 12:43:34 +0100 |
commit | f171decd3f05573efc5420db0c1630969fde67a0 (patch) | |
tree | 3c30a6f020a0dcca362de64b4055e2dbd1c0c80c /src/basic/terminal-util.c | |
parent | 49bd196d693efe0acfc8d56c4e3d8f7ba9f91b5d (diff) | |
download | systemd-f171decd3f05573efc5420db0c1630969fde67a0.tar.gz |
terminal-util: modernize things with TAKE_PTR a bit
Diffstat (limited to 'src/basic/terminal-util.c')
-rw-r--r-- | src/basic/terminal-util.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index ab8917ccc5..a1a789984f 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; } |