X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=57bbc0c63d9bb1c116f7a6147cd55d1129d1a37b;hp=e28c12c6194c7330e149b763f87e743e97ea2b31;hb=7dd8632ac399b726ea1e414bbfab97b6554fe5d8;hpb=6ae89e3fae1efba4a3d53b2793921f415b20e9fb

diff --git a/src/lookup_table.c b/src/lookup_table.c
index e28c12c6..57bbc0c6 100644
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -147,6 +147,7 @@ static void finalize_lte(struct lookup_table_entry *lte)
 	if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
 		unlink(lte->staging_file_name);
 		wimlib_assert(lte->staging_list.next);
+		wimlib_assert(lte->staging_list.prev);
 		list_del(&lte->staging_list);
 	}
 	#endif
@@ -157,39 +158,28 @@ static void finalize_lte(struct lookup_table_entry *lte)
  * reference count reaches 0, it is unlinked from the lookup table.  If,
  * furthermore, the entry has no opened file descriptors associated with it, the
  * entry is freed.  */
-struct lookup_table_entry *
-lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table)
+void lte_decrement_refcnt(struct lookup_table_entry *lte,
+			  struct lookup_table *table)
 {
-	if (lte) {
-		wimlib_assert(lte->refcnt);
-		if (--lte->refcnt == 0) {
-			lookup_table_unlink(table, lte);
-		#ifdef WITH_FUSE
-			if (lte->num_opened_fds == 0)
-		#endif
-			{
-				finalize_lte(lte);
-				lte = NULL;
-			}
-		}
+	wimlib_assert(lte);
+	wimlib_assert(lte->refcnt);
+	if (--lte->refcnt == 0) {
+		lookup_table_unlink(table, lte);
+	#ifdef WITH_FUSE
+		if (lte->num_opened_fds == 0)
+	#endif
+			finalize_lte(lte);
 	}
-	return lte;
 }
 
 #ifdef WITH_FUSE
-struct lookup_table_entry *
-lte_decrement_num_opened_fds(struct lookup_table_entry *lte,
-			     struct lookup_table *table)
+void lte_decrement_num_opened_fds(struct lookup_table_entry *lte,
+			          struct lookup_table *table)
 {
-	if (lte) {
-		wimlib_assert(lte->num_opened_fds);
-		if (--lte->num_opened_fds == 0 && lte->refcnt == 0) {
-			lookup_table_unlink(table, lte);
-			finalize_lte(lte);
-			lte = NULL;
-		}
-	}
-	return lte;
+	wimlib_assert(lte);
+	wimlib_assert(lte->num_opened_fds);
+	if (--lte->num_opened_fds == 0 && lte->refcnt == 0)
+		finalize_lte(lte);
 }
 #endif
 
@@ -450,6 +440,8 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[])
 	struct lookup_table_entry *lte;
 	struct hlist_node *pos;
 
+	wimlib_assert(table);
+
 	i = *(size_t*)hash % table->capacity;
 	hlist_for_each_entry(lte, pos, &table->array[i], hash_list)
 		if (hashes_equal(hash, lte->hash))
@@ -457,6 +449,7 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[])
 	return NULL;
 }
 
+#ifdef WITH_FUSE
 /* 
  * Finds the dentry, lookup table entry, and stream index for a WIM file stream,
  * given a path name.
@@ -490,7 +483,7 @@ int lookup_resource(WIMStruct *w, const char *path,
 	if (!dentry)
 		return -ENOENT;
 
-	inode = dentry->inode;
+	inode = dentry->d_inode;
 
 	wimlib_assert(inode->resolved);
 
@@ -523,6 +516,7 @@ out:
 		*stream_idx_ret = stream_idx;
 	return 0;
 }
+#endif
 
 static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table)
 {
@@ -535,8 +529,7 @@ static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table)
 
 	/* Resolve the alternate data streams */
 	for (u16 i = 0; i < inode->num_ads; i++) {
-		struct ads_entry *cur_entry = inode->ads_entries[i];
-
+		struct ads_entry *cur_entry = &inode->ads_entries[i];
 		lte = __lookup_resource(table, cur_entry->hash);
 		cur_entry->lte = lte;
 	}
@@ -553,8 +546,8 @@ static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table)
  */
 int dentry_resolve_ltes(struct dentry *dentry, void *table)
 {
-	if (!dentry->inode->resolved)
-		inode_resolve_ltes(dentry->inode, table);
+	if (!dentry->d_inode->resolved)
+		inode_resolve_ltes(dentry->d_inode, table);
 	return 0;
 }
 
@@ -567,8 +560,8 @@ int dentry_resolve_ltes(struct dentry *dentry, void *table)
  * data stream in one of the alternate data streams instead of inside the WIM
  * dentry itself.  So we need to check the alternate data streams too.
  *
- * Also, note that a dentry may appear to have than one unnamed stream, but if
- * the SHA1 message digest is all 0's then the corresponding stream does not
+ * Also, note that a dentry may appear to have more than one unnamed stream, but
+ * if the SHA1 message digest is all 0's then the corresponding stream does not
  * really "count" (this is the case for the inode's own file stream when the
  * file stream that should be there is actually in one of the alternate stream
  * entries.).  This is despite the fact that we may need to extract such a