diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-11 15:42:14 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-07-11 23:20:31 +0200 |
| commit | 66855de739dad2ca4fc24f353637fb2757e542ae (patch) | |
| tree | 40a743abe8ec511b21a07cc4158d8da21af43746 /src/machine | |
| parent | fed813778fb89d2c7890845a2e35bca95d4897cf (diff) | |
| download | systemd-66855de739dad2ca4fc24f353637fb2757e542ae.tar.gz systemd-66855de739dad2ca4fc24f353637fb2757e542ae.tar.bz2 systemd-66855de739dad2ca4fc24f353637fb2757e542ae.zip | |
tree-wide: make use of errno_or_else() everywhere
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machine.c | 5 | ||||
| -rw-r--r-- | src/machine/machined-dbus.c | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index ef8ccd98fb..b203a1dde8 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -11,6 +11,7 @@ #include "bus-error.h" #include "bus-util.h" #include "env-file.h" +#include "errno-util.h" #include "escape.h" #include "extract-word.h" #include "fd-util.h" @@ -620,7 +621,7 @@ int machine_get_uid_shift(Machine *m, uid_t *ret) { k = fscanf(f, UID_FMT " " UID_FMT " " UID_FMT "\n", &uid_base, &uid_shift, &uid_range); if (k != 3) { if (ferror(f)) - return -errno; + return errno_or_else(EIO); return -EBADMSG; } @@ -651,7 +652,7 @@ int machine_get_uid_shift(Machine *m, uid_t *ret) { k = fscanf(f, GID_FMT " " GID_FMT " " GID_FMT "\n", &gid_base, &gid_shift, &gid_range); if (k != 3) { if (ferror(f)) - return -errno; + return errno_or_else(EIO); return -EBADMSG; } diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index fea9cc2633..8031dafe15 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -11,6 +11,7 @@ #include "bus-common-errors.h" #include "bus-util.h" #include "cgroup-util.h" +#include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "format-util.h" @@ -625,7 +626,7 @@ static int clean_pool_done(Operation *operation, int ret, sd_bus_error *error) { errno = 0; n = fread(&success, 1, sizeof(success), f); if (n != sizeof(success)) - return ret < 0 ? ret : (errno != 0 ? -errno : -EIO); + return ret < 0 ? ret : errno_or_else(EIO); if (ret < 0) { _cleanup_free_ char *name = NULL; @@ -669,7 +670,7 @@ static int clean_pool_done(Operation *operation, int ret, sd_bus_error *error) { errno = 0; n = fread(&size, 1, sizeof(size), f); if (n != sizeof(size)) - return errno != 0 ? -errno : -EIO; + return errno_or_else(EIO); r = sd_bus_message_append(reply, "(st)", name, size); if (r < 0) @@ -914,8 +915,8 @@ static int method_map_from_machine_user(sd_bus_message *message, void *userdata, if (k < 0 && feof(f)) break; if (k != 3) { - if (ferror(f) && errno > 0) - return -errno; + if (ferror(f)) + return errno_or_else(EIO); return -EIO; } @@ -972,8 +973,8 @@ static int method_map_to_machine_user(sd_bus_message *message, void *userdata, s if (k < 0 && feof(f)) break; if (k != 3) { - if (ferror(f) && errno > 0) - return -errno; + if (ferror(f)) + return errno_or_else(EIO); return -EIO; } @@ -1036,8 +1037,8 @@ static int method_map_from_machine_group(sd_bus_message *message, void *groupdat if (k < 0 && feof(f)) break; if (k != 3) { - if (ferror(f) && errno > 0) - return -errno; + if (ferror(f)) + return errno_or_else(EIO); return -EIO; } @@ -1094,8 +1095,8 @@ static int method_map_to_machine_group(sd_bus_message *message, void *groupdata, if (k < 0 && feof(f)) break; if (k != 3) { - if (ferror(f) && errno > 0) - return -errno; + if (ferror(f)) + return errno_or_else(EIO); return -EIO; } |