X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Finode.c;h=6277f0c427d678e49959240963921a898e160ec3;hb=2fc33f535a398ea85964c0e483c5692821d775f3;hp=545a940c0916a61ed6f4772c1a8c5f253b75e9e2;hpb=aa3a2830cd4154238bc6a342ffea43d9ac69a14c;p=wimlib

diff --git a/src/inode.c b/src/inode.c
index 545a940c..6277f0c4 100644
--- a/src/inode.c
+++ b/src/inode.c
@@ -57,7 +57,6 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps)
 	inode->i_security_id = -1;
 	/*inode->i_nlink = 0;*/
 	inode->i_not_rpfixed = 1;
-	INIT_LIST_HEAD(&inode->i_list);
 	INIT_LIST_HEAD(&inode->i_dentry);
 	inode->i_streams = inode->i_embedded_streams;
 	if (set_timestamps) {
@@ -86,8 +85,6 @@ free_inode(struct wim_inode *inode)
 		FREE(inode->i_streams);
 	if (inode->i_extra)
 		FREE(inode->i_extra);
-	/* HACK: This may instead delete the inode from i_list, but hlist_del()
-	 * behaves the same as list_del(). */
 	if (!hlist_unhashed(&inode->i_hlist))
 		hlist_del(&inode->i_hlist);
 	FREE(inode);
@@ -480,21 +477,6 @@ inode_resolve_streams(struct wim_inode *inode, struct blob_table *table,
 	return 0;
 }
 
-/* Undo the effects of inode_resolve_streams().  */
-void
-inode_unresolve_streams(struct wim_inode *inode)
-{
-	for (unsigned i = 0; i < inode->i_num_streams; i++) {
-
-		if (!inode->i_streams[i].stream_resolved)
-			continue;
-
-		copy_hash(inode->i_streams[i]._stream_hash,
-			  stream_hash(&inode->i_streams[i]));
-		inode->i_streams[i].stream_resolved = 0;
-	}
-}
-
 int
 blob_not_found_error(const struct wim_inode *inode, const u8 *hash)
 {
@@ -547,7 +529,7 @@ inode_get_blob_for_unnamed_data_stream(const struct wim_inode *inode,
 {
 	const struct wim_inode_stream *strm;
 
-	strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+	strm = inode_get_unnamed_data_stream(inode);
 	if (!strm)
 		return NULL;
 
@@ -561,7 +543,7 @@ inode_get_blob_for_unnamed_data_stream_resolved(const struct wim_inode *inode)
 {
 	const struct wim_inode_stream *strm;
 
-	strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+	strm = inode_get_unnamed_data_stream(inode);
 	if (!strm)
 		return NULL;
 
@@ -578,7 +560,7 @@ inode_get_hash_of_unnamed_data_stream(const struct wim_inode *inode)
 {
 	const struct wim_inode_stream *strm;
 
-	strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+	strm = inode_get_unnamed_data_stream(inode);
 	if (!strm)
 		return zero_hash;