Kill all remaining users of ERRNO_TO_ERROR().

[osl.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index 6f136719358a1889816f245862ed00caeee4efe8..357fbe765846a503f0ab7e7b04d47e636048b317 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -15,7 +15,7 @@
 #include "log.h"
 #include "osl.h"
 #include "error.h"
-#include "fd.h"
+#include "util.h"
 #include "osl_core.h"
 #include "fsck.cmdline.h"
 
@@ -39,7 +39,10 @@ static struct fsck_args_info conf;
 #define FSCK_ERRORS \
        FSCK_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \
        FSCK_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \
-       FSCK_ERROR(SYNTAX, "fsck syntax error"),
+       FSCK_ERROR(SYNTAX, "fsck syntax error"), \
+       FSCK_ERROR(ACCESS, "permission denied"), \
+       FSCK_ERROR(CHDIR, "could not change directory"), \
+       FSCK_ERROR(OPENDIR, "could not open directory"),
 
 #define FSCK_ERROR(num, txt) E_FSCK_ ## num
 enum {
@@ -217,9 +220,9 @@ static int uint32_compare(const struct osl_object *obj1, const struct osl_object
  */
 static inline int __fchdir(int fd)
 {
-       if (fchdir(fd) < 0)
-               return -ERRNO_TO_ERROR(errno);
-       return 1;
+       if (fchdir(fd) >= 0)
+               return 1;
+       return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR;
 }
 
 /**
@@ -233,7 +236,7 @@ _static_inline_ int __chdir(const char *path)
 {
        if (chdir(path) >= 0)
                return 1;
-       return -ERRNO_TO_ERROR(errno);
+       return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR;
 }
 
 /**
@@ -276,7 +279,7 @@ static int fsck_opendir(const char *dirname, DIR **dir, int *cwd)
        *dir = opendir(".");
        if (*dir)
                return 1;
-       ret = -ERRNO_TO_ERROR(errno);
+       ret = errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_OPENDIR;
 /* Ignore return value of fchdir() and close(). We're busted anyway. */
        if (cwd)
                fchdir(*cwd);
@@ -310,7 +313,7 @@ static int for_each_file_in_dir(const char *dirname,
        int cwd_fd, ret2, ret = fsck_opendir(dirname, &dir, &cwd_fd);
 
        if (ret < 0)
-               return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret;
+               return ret == -E_FSCK_ACCESS? 1 : ret;
        /* scan cwd recursively */
        while ((entry = readdir(dir))) {
                mode_t m;
@@ -407,13 +410,8 @@ static int check_index_ranges(struct osl_table *t)
                                continue;
                        ret = check_range(t, i, j);
                        if (ret < 0) {
-                               if (ret != -E_OSL_INVALID_OBJECT &&
-                                               ret != -E_FSCK_RANGE_VIOLATION)
+                               if (ret != -E_FSCK_RANGE_VIOLATION)
                                        goto err;
-                               if (ret == -E_OSL_INVALID_OBJECT) {
-                                       CRIT_LOG("row %d, col %d maps to an "
-                                               "invalid object\n", i, j);
-                               }
                                ret = mark_row_invalid(t, i);
                                if (ret < 0)
                                        goto err;
@@ -517,14 +515,9 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
                for (j = 0; j < t->num_rows; j++) {
                        struct osl_object obj;
                        ret = get_mapped_object(t, i, j, &obj);
-                       if (ret >= 0) {
-                               loss[i] -= obj.size + 1; /* add one for header byte */
-                               continue;
-                       }
-                       if (ret != -E_OSL_INVALID_OBJECT)
+                       if (ret < 0)
                                goto err;
-                       CRIT_LOG("row %d, col %d points to an invalid "
-                               "mapped object, bad\n", j, i);
+                       loss[i] -= obj.size;
                }
        }
        ret = 0;
@@ -754,7 +747,7 @@ static unsigned files_pruned;
 int prune_disk_storage_file(const char *path, void *private_data)
 {
        HASH_TYPE hash[HASH_SIZE];
-       unsigned flags = *(unsigned *)private_data;
+       uint8_t flags = *(uint8_t *)private_data;
        struct osl_object obj = {.data = hash, .size = HASH_SIZE};
        struct osl_row *row;
        int ret = -1;
@@ -811,8 +804,9 @@ static int prune_disk_storage_files(struct osl_table *t)
        INFO_LOG("looking for unreferenced disk storage files\n");
        FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
                char *dirname = column_filename(t, i);
+               uint8_t flags = t->desc->flags;
                ret = for_each_file_in_dir(dirname, prune_disk_storage_file,
-                       (unsigned *)&t->desc->flags);
+                       &flags);
                free(dirname);
        }
        if (files_pruned)