cgroup-util: check ferror() first

Also, there's no need to set use errno_or_else(), since fscanf() is documented to set errno on error.
2023-12-15 21:21:17 +08:00
parent 674becc987
commit 121b705426
1 changed files with 3 additions and 4 deletions
@@ -2141,15 +2141,14 @@ int cg_kernel_controllers(Set **ret) {
                _cleanup_free_ char *controller = NULL;
                int enabled = 0;

-                errno = 0;
                if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) {

+                        if (ferror(f))
+                                return -errno;
+
                        if (feof(f))
                                break;

-                        if (ferror(f))
-                                return errno_or_else(EIO);
-
                        return -EBADMSG;
                }