Inline para_fchdir(), move it to fsck.c and rename it.

[osl.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index dea7ad6e07079bb1672546aea47744e91564007d..b5e4fdbe16e0fc593e303de69de8e521b845ed31 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -130,7 +130,7 @@ static int _write_all(int fd, const char *buf, size_t len)
  *
  * \sa malloc(3).
  */
-__must_check __malloc static void *para_malloc(size_t size)
+__must_check __malloc static void *fsck_malloc(size_t size)
 {
        assert(size);
        void *p = malloc(size);
@@ -155,9 +155,9 @@ __must_check __malloc static void *para_malloc(size_t size)
  *
  * \sa calloc(3)
  */
-__must_check __malloc static void *para_calloc(size_t size)
+__must_check __malloc static void *fsck_calloc(size_t size)
 {
-       void *ret = para_malloc(size);
+       void *ret = fsck_malloc(size);
 
        memset(ret, 0, size);
        return ret;
@@ -176,7 +176,7 @@ __must_check __malloc static void *para_calloc(size_t size)
  *
  * \sa strdup(3)
  */
-__must_check __malloc static char *para_strdup(const char *s)
+__must_check __malloc static char *fsck_strdup(const char *s)
 {
        char *ret;
 
@@ -208,6 +208,20 @@ static int uint32_compare(const struct osl_object *obj1, const struct osl_object
        return 0;
 }
 
+/**
+ * A wrapper for fchdir().
+ *
+ * \param fd An open file descriptor.
+ *
+ * \return Standard.
+ */
+static inline int __fchdir(int fd)
+{
+       if (fchdir(fd) < 0)
+               return -ERRNO_TO_ERROR(errno);
+       return 1;
+}
+
 /**
  * Traverse the given directory recursively.
  *
@@ -263,7 +277,7 @@ static int for_each_file_in_dir(const char *dirname,
        ret = 1;
 out:
        closedir(dir);
-       ret2 = para_fchdir(cwd_fd);
+       ret2 = __fchdir(cwd_fd);
        if (ret2 < 0 && ret >= 0)
                ret = ret2;
        close(cwd_fd);
@@ -412,7 +426,7 @@ static int prune_invalid_rows_from_index(struct osl_table *t)
        DEBUG_LOG("unmapping index\n");
        osl_munmap(t->index_map.data, t->index_map.size);
        filename = index_filename(t->desc);
-       ret = para_truncate(filename, t->row_index_size
+       ret = truncate_file(filename, t->row_index_size
                * t->num_invalid_rows);
        free(filename);
        if (ret < 0)
@@ -428,7 +442,7 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
 {
        int i, j, ret;
        const struct osl_column_description *cd;
-       uint32_t *loss = para_malloc(sizeof(uint32_t) * t->desc->num_columns);
+       uint32_t *loss = fsck_malloc(sizeof(uint32_t) * t->desc->num_columns);
 
        INFO_LOG("looking for mapped objects not contained in index\n");
        /* first count used bytes */
@@ -496,8 +510,8 @@ static int prune_objects(struct osl_table *t, uint32_t *lost_bytes)
 {
        int i, ret;
        const struct osl_column_description *cd;
-       char **col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
-       char **new_col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
+       char **col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
+       char **new_col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
        char *idx_filename = index_filename(t->desc);
        char *old_idx_filename = make_message("%s.bak", idx_filename);
        int fd;
@@ -630,7 +644,7 @@ static int check_disk_storage_presence(struct osl_table *t)
 
        if (!t->num_rows)
                return 1;
-       hashes = para_malloc(t->num_rows * HASH_SIZE);
+       hashes = fsck_malloc(t->num_rows * HASH_SIZE);
        INFO_LOG("looking for missing disk storage objects\n");
        for (i = 0; i < t->num_rows; i++) {
                if (row_is_invalid(t, i))
@@ -849,7 +863,7 @@ const char *get_asc_storage_type(enum osl_storage_type st)
 
 #define APPEND_ASC_SF(sf, flag, str) do { if (sf & flag) { \
        if (str) str = make_message("%s%s", str, " | " # flag); \
-       else str = para_strdup(#flag); }} while (0)
+       else str = fsck_strdup(#flag); }} while (0)
 
 
 char *get_asc_storage_flags(enum osl_storage_type sf)
@@ -1126,7 +1140,7 @@ static int check_all_tables(char *db_dir)
                        break;
        }
        closedir(dir);
-       ret2 = para_fchdir(cwd_fd);
+       ret2 = __fchdir(cwd_fd);
        if (ret2 < 0 && ret >= 0)
                ret = ret2;
        close(cwd_fd);