Remove duplicate words & fix grammatical errors

[wimlib] / src / inode_fixup.c

diff --git a/src/inode_fixup.c b/src/inode_fixup.c
index 01a16d19af2e13ca07202477b972f9c926172f51..2eb15a87d83d55e6c2cece223f475f58688f2746 100644 (file)
--- a/src/inode_fixup.c
+++ b/src/inode_fixup.c
@@ -56,9 +56,9 @@ static void
 inconsistent_inode(const struct wim_inode *inode)
 {
        if (wimlib_print_errors) {
-               ERROR("An inconsistent hard link group that cannot be corrected has "
-                     "been detected");
-               ERROR("The dentries are located at the following paths:");
+               WARNING("An inconsistent hard link group that cannot be corrected has "
+                       "been detected");
+               WARNING("The dentries are located at the following paths:");
                print_inode_dentries(inode);
        }
 }
@@ -73,11 +73,9 @@ ads_entries_have_same_name(const struct wim_ads_entry *entry_1,
 }
 
 static bool
-ref_inodes_consistent(const struct wim_inode * restrict ref_inode_1,
-                     const struct wim_inode * restrict ref_inode_2)
+ref_inodes_consistent(const struct wim_inode *ref_inode_1,
+                     const struct wim_inode *ref_inode_2)
 {
-       wimlib_assert(ref_inode_1 != ref_inode_2);
-
        if (ref_inode_1->i_num_ads != ref_inode_2->i_num_ads)
                return false;
        if (ref_inode_1->i_security_id != ref_inode_2->i_security_id
@@ -121,21 +119,21 @@ inodes_consistent(const struct wim_inode *ref_inode,
                  const struct wim_inode *inode)
 {
        if (ref_inode->i_security_id != inode->i_security_id) {
-               ERROR("Security ID mismatch: %d != %d",
-                     ref_inode->i_security_id, inode->i_security_id);
+               WARNING("Security ID mismatch: %d != %d",
+                       ref_inode->i_security_id, inode->i_security_id);
                return false;
        }
 
        if (ref_inode->i_attributes != inode->i_attributes) {
-               ERROR("Attributes mismatch: 0x%08x != 0x%08x",
-                     ref_inode->i_attributes, inode->i_attributes);
+               WARNING("Attributes mismatch: 0x%08x != 0x%08x",
+                       ref_inode->i_attributes, inode->i_attributes);
                return false;
        }
 
        if (inode_has_data_streams(inode)) {
                if (ref_inode->i_num_ads != inode->i_num_ads) {
-                       ERROR("Stream count mismatch: %u != %u",
-                             ref_inode->i_num_ads, inode->i_num_ads);
+                       WARNING("Stream count mismatch: %u != %u",
+                               ref_inode->i_num_ads, inode->i_num_ads);
                        return false;
                }
                for (unsigned i = 0; i <= ref_inode->i_num_ads; i++) {
@@ -144,13 +142,13 @@ inodes_consistent(const struct wim_inode *ref_inode,
                        ref_hash = inode_stream_hash(ref_inode, i);
                        hash = inode_stream_hash(inode, i);
                        if (!hashes_equal(ref_hash, hash) && !is_zero_hash(hash)) {
-                               ERROR("Stream hash mismatch");
+                               WARNING("Stream hash mismatch");
                                return false;
                        }
                        if (i && !ads_entries_have_same_name(&ref_inode->i_ads_entries[i - 1],
                                                             &inode->i_ads_entries[i - 1]))
                        {
-                               ERROR("Stream name mismatch");
+                               WARNING("Stream name mismatch");
                                return false;
                        }
                }
@@ -189,10 +187,8 @@ fix_true_inode(struct wim_inode *inode, struct list_head *inode_list)
 
        inode_for_each_dentry(dentry, ref_inode) {
                if (dentry != ref_dentry) {
-                       if (!inodes_consistent(ref_inode, dentry->d_inode)) {
+                       if (!inodes_consistent(ref_inode, dentry->d_inode))
                                inconsistent_inode(ref_inode);
-                               return WIMLIB_ERR_INVALID_METADATA_RESOURCE;
-                       }
                        /* Free the unneeded `struct wim_inode'. */
                        wimlib_assert(dentry->d_inode->i_nlink == 1);
                        free_inode(dentry->d_inode);
@@ -349,7 +345,7 @@ fix_inodes(struct wim_inode_table *table, struct list_head *inode_list,
        struct hlist_node *cur, *tmp;
        int ret;
        INIT_LIST_HEAD(inode_list);
-       for (u64 i = 0; i < table->capacity; i++) {
+       for (size_t i = 0; i < table->capacity; i++) {
                hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist) {
                        hlist_del_init(&inode->i_hlist);
                        ret = fix_nominal_inode(inode, inode_list, ino_changes_needed);
@@ -434,8 +430,8 @@ inode_table_insert(struct wim_dentry *dentry, void *_table)
  * WIM) is examined for consistency and may be split into multiple "true" inodes
  * that are maximally sized consistent sets of dentries.
  *
- * On success, the list of "true" inodes, linked by the i_hlist field,
- * is returned in the hlist @inode_list.
+ * On success, the list of "true" inodes, linked by the i_list field,
+ * is returned in the list @inode_list.
  *
  * Return values:
  *     WIMLIB_ERR_SUCCESS (0)
@@ -478,7 +474,7 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list)
                }
        }
        /* On success, all the inodes have been moved to the image inode list,
-        * so there's no need to delete from from the hash lists in the inode
+        * so there's no need to delete from the hash lists in the inode
         * table before freeing the hash buckets array directly. */
        ret = 0;
        goto out_destroy_inode_table_raw;