Minor cleanups

[wimlib] / src / hardlink.c

diff --git a/src/hardlink.c b/src/hardlink.c
index c2f0358f8529a49aa827911cfcb34ebb0e4b7b68..e3f9e27af37e3d398c2e27379c57d41a80de4a53 100644 (file)
--- a/src/hardlink.c
+++ b/src/hardlink.c
@@ -32,22 +32,22 @@
 
 /*                             NULL        NULL
  *                              ^           ^
- *         dentry               |           |                
- *        /     \          -----------  -----------           
+ *         dentry               |           |
+ *        /     \          -----------  -----------
  *        |      dentry<---|  struct  | |  struct  |---> dentry
- *        \     /          |inode| |inode|       
+ *        \     /          |  inode   | |  inode   |
  *         dentry          ------------ ------------
  *                              ^           ^
  *                              |           |
  *                              |           |                   dentry
  *                         -----------  -----------            /      \
  *               dentry<---|  struct  | |  struct  |---> dentry        dentry
- *              /          |inode| |inode|           \      /
+ *              /          |  inode   | |  inode   |           \      /
  *         dentry          ------------ ------------            dentry
  *                              ^           ^
  *                              |           |
  *                            -----------------
- *    inode_table->array | idx 0 | idx 1 | 
+ *        inode_table->array  | idx 0 | idx 1 |
  *                            -----------------
  */
 
@@ -66,7 +66,7 @@ int init_inode_table(struct inode_table *table, size_t capacity)
 }
 
 
-static size_t inode_link_count(const struct inode *inode)
+static inline size_t inode_link_count(const struct inode *inode)
 {
        const struct list_head *cur;
        size_t size = 0;
@@ -75,7 +75,7 @@ static size_t inode_link_count(const struct inode *inode)
        return size;
 }
 
-/* 
+/*
  * Insert a dentry into the inode table based on its inode
  * ID.
  *
@@ -162,10 +162,12 @@ static void print_inode_dentries(const struct inode *inode)
 
 static void inconsistent_inode(const struct inode *inode)
 {
-       ERROR("An inconsistent hard link group that we cannot correct has been "
-             "detected");
+       ERROR("An inconsistent hard link group that cannot be corrected has "
+             "been detected");
        ERROR("The dentries are located at the following paths:");
+#ifdef ENABLE_ERROR_MESSAGES
        print_inode_dentries(inode);
+#endif
 }
 
 static bool ref_inodes_consistent(const struct inode * restrict ref_inode_1,
@@ -217,7 +219,7 @@ static bool inodes_consistent(const struct inode * restrict ref_inode,
 }
 
 /* Fix up a "true" inode and check for inconsistencies */
-static int fix_true_inode(struct inode *inode)
+static int fix_true_inode(struct inode *inode, struct hlist_head *inode_list)
 {
        struct dentry *dentry;
        struct dentry *ref_dentry = NULL;
@@ -239,6 +241,7 @@ static int fix_true_inode(struct inode *inode)
 
        ref_inode = ref_dentry->d_inode;
        ref_inode->link_count = 1;
+       hlist_add_head(&ref_inode->hlist, inode_list);
 
        list_del(&inode->dentry_list);
        list_add(&ref_inode->dentry_list, &ref_dentry->inode_dentry_list);
@@ -262,7 +265,7 @@ static int fix_true_inode(struct inode *inode)
        return 0;
 }
 
-/* 
+/*
  * Fixes up a nominal inode.
  *
  * By a nominal inode we mean a group of two or more dentries that share
@@ -279,7 +282,7 @@ static int fix_true_inode(struct inode *inode)
 static int
 fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list)
 {
-       struct dentry *dentry, *ref_dentry;
+       struct dentry *dentry;
        struct hlist_node *cur, *tmp;
        int ret;
        size_t num_true_inodes;
@@ -314,7 +317,7 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list)
        if (list_empty(&dentries_with_data_streams)) {
        #ifdef ENABLE_DEBUG
                if (inode->link_count > 1) {
-                       DEBUG("Found link group of size %zu without "
+                       DEBUG("Found link group of size %u without "
                              "any data streams:", inode->link_count);
                        print_inode_dentries(inode);
                        DEBUG("We are going to interpret it as true "
@@ -322,8 +325,7 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list)
                              "are consistent.");
                }
        #endif
-               hlist_add_head(&inode->hlist, inode_list);
-               return fix_true_inode(inode);
+               return fix_true_inode(inode, inode_list);
        }
 
         /* One or more dentries had data streams specified.  We check each of
@@ -389,8 +391,7 @@ next_dentry_2:
        #endif
 
        hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, hlist) {
-               hlist_add_head(&inode->hlist, inode_list);
-               ret = fix_true_inode(inode);
+               ret = fix_true_inode(inode, inode_list);
                if (ret != 0)
                        return ret;
        }