X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futil.c;h=d01c2061b423c6b60a4dc422a1d358e46eb5dad5;hp=9ec6e2fe2f5e2ad54bb373eb12da157806f7bab8;hb=23406ce58aa7142e8df3c5c9e5ac34a01e90e3e0;hpb=0ad1271f564b9c956685938167f7ea8c301e835e diff --git a/src/shared/util.c b/src/shared/util.c index 9ec6e2fe2..d01c2061b 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2869,7 +2869,8 @@ int get_ctty(pid_t pid, dev_t *_devnr, char **r) { snprintf(fn, sizeof(fn), "/dev/char/%u:%u", major(devnr), minor(devnr)); char_array_0(fn); - if ((k = readlink_malloc(fn, &s)) < 0) { + k = readlink_malloc(fn, &s); + if (k < 0) { if (k != -ENOENT) return k; @@ -2890,7 +2891,8 @@ int get_ctty(pid_t pid, dev_t *_devnr, char **r) { * symlink in /dev/char. Let's return something * vaguely useful. */ - if (!(b = strdup(fn + 5))) + b = strdup(fn + 5); + if (!b) return -ENOMEM; *r = b;