tree-wide: make use of errno_or_else() everywhere

2019-07-11 23:20:31 +02:00
parent fed813778f
commit 66855de739
16 changed files with 60 additions and 58 deletions
@@ -81,7 +81,7 @@ int cg_read_pid(FILE *f, pid_t *_pid) {
                if (feof(f))
                        return 0;

-                return errno > 0 ? -errno : -EIO;
+                return errno_or_else(EIO);
        }

        if (ul <= 0)
@@ -770,10 +770,8 @@ int cg_trim(const char *controller, const char *path, bool delete_root) {
        if (nftw(fs, trim_cb, 64, FTW_DEPTH|FTW_MOUNT|FTW_PHYS) != 0) {
                if (errno == ENOENT)
                        r = 0;
-                else if (errno > 0)
-                        r = -errno;
                else
-                        r = -EIO;
+                        r = errno_or_else(EIO);
        }

        if (delete_root) {
@@ -2502,8 +2500,8 @@ int cg_kernel_controllers(Set **ret) {
                        if (feof(f))
                                break;

-                        if (ferror(f) && errno > 0)
-                                return -errno;
+                        if (ferror(f))
+                                return errno_or_else(EIO);

                        return -EBADMSG;
                }