wimlib-imagex: improve error message

[wimlib] / src / inode_fixup.c

diff --git a/src/inode_fixup.c b/src/inode_fixup.c
index 2ece5308e79b9b678a01fb161b94358fd46314f3..51893fc19096463098f32151bef7304839abdf7a 100644 (file)
--- a/src/inode_fixup.c
+++ b/src/inode_fixup.c
@@ -67,13 +67,13 @@ inode_table_insert(struct wim_dentry *dentry, void *_params)
        struct wim_inode *inode;
 
        if (d_inode->i_ino == 0) {
        struct wim_inode *inode;
 
        if (d_inode->i_ino == 0) {

-               hlist_add_head(&d_inode->i_hlist, &table->extra_inodes);
+               hlist_add_head(&d_inode->i_hlist_node, &table->extra_inodes);

                return 0;
        }
 
        /* Try adding this dentry to an existing inode.  */
        pos = d_inode->i_ino % table->capacity;
                return 0;
        }
 
        /* Try adding this dentry to an existing inode.  */
        pos = d_inode->i_ino % table->capacity;

-       hlist_for_each_entry(inode, &table->array[pos], i_hlist) {
+       hlist_for_each_entry(inode, &table->array[pos], i_hlist_node) {

                if (inode->i_ino != d_inode->i_ino) {
                        continue;
                }
                if (inode->i_ino != d_inode->i_ino) {
                        continue;
                }


@@ -91,7 +91,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params)
                                WARNING("Unsupported directory hard link "
                                        "\"%"TS"\" <=> \"%"TS"\"",
                                        dentry_full_path(dentry),
                                WARNING("Unsupported directory hard link "
                                        "\"%"TS"\" <=> \"%"TS"\"",
                                        dentry_full_path(dentry),

-                                       inode_first_full_path(inode));
+                                       inode_any_full_path(inode));

                        } else if (params->num_dir_hard_links ==
                                   MAX_DIR_HARD_LINK_WARNINGS + 1)
                        {
                        } else if (params->num_dir_hard_links ==
                                   MAX_DIR_HARD_LINK_WARNINGS + 1)
                        {


@@ -107,7 +107,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params)
        }
 
        /* Keep this dentry's inode.  */
        }
 
        /* Keep this dentry's inode.  */

-       hlist_add_head(&d_inode->i_hlist, &table->array[pos]);
+       hlist_add_head(&d_inode->i_hlist_node, &table->array[pos]);

        return 0;
 }
 
        return 0;
 }
 


@@ -139,7 +139,7 @@ reassign_inode_numbers(struct hlist_head *inode_list)
        struct wim_inode *inode;
        u64 cur_ino = 1;
 
        struct wim_inode *inode;
        u64 cur_ino = 1;
 

-       hlist_for_each_entry(inode, inode_list, i_hlist)
+       hlist_for_each_entry(inode, inode_list, i_hlist_node)

                inode->i_ino = cur_ino++;
 }
 
                inode->i_ino = cur_ino++;
 }