decompress_common: switch to subtables for Huffman decoding

[wimlib] / src / inode.c

diff --git a/src/inode.c b/src/inode.c
index e43fd2d0d1b446f70a5b334f45ad05a76a2d1deb..034b9a11f3ec1d70b58df2f3a4eef1af147b2355 100644 (file)
--- a/src/inode.c
+++ b/src/inode.c
@@ -57,7 +57,7 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps)
        inode->i_security_id = -1;
        /*inode->i_nlink = 0;*/
        inode->i_rp_flags = WIM_RP_FLAG_NOT_FIXED;
-       INIT_LIST_HEAD(&inode->i_dentry);
+       INIT_HLIST_HEAD(&inode->i_alias_list);
        inode->i_streams = inode->i_embedded_streams;
        if (set_timestamps) {
                u64 now = now_as_wim_timestamp();
@@ -85,8 +85,8 @@ free_inode(struct wim_inode *inode)
                FREE(inode->i_streams);
        if (inode->i_extra)
                FREE(inode->i_extra);
-       if (!hlist_unhashed(&inode->i_hlist))
-               hlist_del(&inode->i_hlist);
+       if (!hlist_unhashed(&inode->i_hlist_node))
+               hlist_del(&inode->i_hlist_node);
        FREE(inode);
 }
 
@@ -108,7 +108,7 @@ d_associate(struct wim_dentry *dentry, struct wim_inode *inode)
 {
        wimlib_assert(!dentry->d_inode);
 
-       list_add_tail(&dentry->d_alias, &inode->i_dentry);
+       hlist_add_head(&dentry->d_alias_node, &inode->i_alias_list);
        dentry->d_inode = inode;
        inode->i_nlink++;
 }
@@ -125,7 +125,7 @@ d_disassociate(struct wim_dentry *dentry)
 
        wimlib_assert(inode->i_nlink > 0);
 
-       list_del(&dentry->d_alias);
+       hlist_del(&dentry->d_alias_node);
        dentry->d_inode = NULL;
        inode->i_nlink--;
 
@@ -267,7 +267,7 @@ inode_add_stream(struct wim_inode *inode, int stream_type,
 {
        if (inode->i_num_streams >= 0xFFFF) {
                ERROR("Inode has too many streams! Path=\"%"TS"\"",
-                     inode_first_full_path(inode));
+                     inode_any_full_path(inode));
                errno = EFBIG;
                return NULL;
        }
@@ -492,7 +492,7 @@ blob_not_found_error(const struct wim_inode *inode, const u8 *hash)
                ERROR("\"%"TS"\": blob not found\n"
                      "        SHA-1 message digest of missing blob:\n"
                      "        %"TS"",
-                     inode_first_full_path(inode), hashstr);
+                     inode_any_full_path(inode), hashstr);
        }
        return WIMLIB_ERR_RESOURCE_NOT_FOUND;
 }