logind: add support for automatic suspend/hibernate/shutdown on idle

[elogind.git] / src / shared / util.c

diff --git a/src/shared/util.c b/src/shared/util.c
index 9ec6e2fe2f5e2ad54bb373eb12da157806f7bab8..d01c2061b423c6b60a4dc422a1d358e46eb5dad5 100644 (file)
--- 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);
 
         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;
 
                 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. */
 
                  * 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;
                         return -ENOMEM;
 
                 *r = b;