X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.h;h=0a1416eaf261c810d79ceaefe6d4c0120f51f238;hb=6461b7e0a98286fa4dca4ede22cdbd07c6240e5d;hp=97d06ec76969d022359ddef792f201e432bc68ed;hpb=edd7e04ddef20c47975bd2535960b6223496d99b;p=wimlib

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 97d06ec7..0a1416ea 100644
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -24,8 +24,6 @@ struct lookup_table {
 	u64 capacity;
 };
 
-struct wimlib_fd;
-
 #ifdef WITH_NTFS_3G
 struct ntfs_location {
 	char *path_utf8;
@@ -185,29 +183,32 @@ struct lookup_table_entry {
 		struct resource_entry output_resource_entry;
 
 		struct list_head msg_list;
-		struct list_head dentry_list;
+		struct list_head inode_list;
 	};
 
-	union {
-		/* This field is used for the special hardlink or symlink image
-		 * extraction mode.   In these mode, all identical files are linked
-		 * together, and @extracted_file will be set to the filename of the
-		 * first extracted file containing this stream.  */
-		char *extracted_file;
-
-		/* List of lookup table entries that correspond to streams that have
-		 * been extracted to the staging directory when modifying a read-write
-		 * mounted WIM. */
-		struct list_head staging_list;
-	};
+	/* List of lookup table entries that correspond to streams that have
+	 * been extracted to the staging directory when modifying a read-write
+	 * mounted WIM.
+	 *
+	 * This field is also used to make other lists of lookup table entries.
+	 * */
+	struct list_head staging_list;
+
+	/* This field is used for the special hardlink or symlink image
+	 * extraction mode.   In these mode, all identical files are linked
+	 * together, and @extracted_file will be set to the filename of the
+	 * first extracted file containing this stream.  */
+	char *extracted_file;
 };
 
-static inline u64 wim_resource_size(const struct lookup_table_entry *lte)
+static inline u64
+wim_resource_size(const struct lookup_table_entry *lte)
 {
 	return lte->resource_entry.original_size;
 }
 
-static inline u64 wim_resource_chunks(const struct lookup_table_entry *lte)
+static inline u64
+wim_resource_chunks(const struct lookup_table_entry *lte)
 {
 	return (wim_resource_size(lte) + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE;
 }
@@ -227,69 +228,87 @@ wim_resource_compression_type(const struct lookup_table_entry *lte)
 {
 	if (!(lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
 	    || lte->resource_location != RESOURCE_IN_WIM)
-		return WIM_COMPRESSION_TYPE_NONE;
+		return WIMLIB_COMPRESSION_TYPE_NONE;
 	return wimlib_get_compression_type(lte->wim);
 }
 
 
-extern struct lookup_table *new_lookup_table(size_t capacity);
+extern struct lookup_table *
+new_lookup_table(size_t capacity);
+
+extern int
+read_lookup_table(WIMStruct *w);
 
-extern void lookup_table_insert(struct lookup_table *table,
-				struct lookup_table_entry *lte);
+extern int
+write_lookup_table(struct lookup_table *table, FILE *out,
+		   struct resource_entry *out_res_entry);
+extern void
+free_lookup_table(struct lookup_table *table);
+
+extern void
+lookup_table_insert(struct lookup_table *table, struct lookup_table_entry *lte);
 
 /* Unlinks a lookup table entry from the table; does not free it. */
-static inline void lookup_table_unlink(struct lookup_table *table,
-			 	       struct lookup_table_entry *lte)
+static inline void
+lookup_table_unlink(struct lookup_table *table, struct lookup_table_entry *lte)
 {
 	hlist_del(&lte->hash_list);
 	table->num_entries--;
 }
 
-extern struct lookup_table_entry *new_lookup_table_entry();
+extern struct lookup_table_entry *
+new_lookup_table_entry();
 
 extern struct lookup_table_entry *
 clone_lookup_table_entry(const struct lookup_table_entry *lte);
 
-extern int for_lookup_table_entry(struct lookup_table *table,
-				  int (*visitor)(struct lookup_table_entry *, void *),
-				  void *arg);
+extern void
+print_lookup_table_entry(const struct lookup_table_entry *entry);
+
+extern void
+free_lookup_table_entry(struct lookup_table_entry *lte);
+
+extern int
+for_lookup_table_entry(struct lookup_table *table,
+		       int (*visitor)(struct lookup_table_entry *, void *),
+		       void *arg);
 
 extern struct lookup_table_entry *
 __lookup_resource(const struct lookup_table *table, const u8 hash[]);
 
-extern int lookup_resource(WIMStruct *w, const char *path,
-			   int lookup_flags, struct dentry **dentry_ret,
-			   struct lookup_table_entry **lte_ret,
-			   u16 *stream_idx_ret);
+extern int
+lookup_resource(WIMStruct *w, const char *path,
+		int lookup_flags, struct dentry **dentry_ret,
+		struct lookup_table_entry **lte_ret, u16 *stream_idx_ret);
 
-extern void lte_decrement_refcnt(struct lookup_table_entry *lte,
-			         struct lookup_table *table);
+extern void
+lte_decrement_refcnt(struct lookup_table_entry *lte,
+		     struct lookup_table *table);
 #ifdef WITH_FUSE
-extern void lte_decrement_num_opened_fds(struct lookup_table_entry *lte);
+extern void
+lte_decrement_num_opened_fds(struct lookup_table_entry *lte);
 #endif
 
-extern int lte_zero_out_refcnt(struct lookup_table_entry *entry, void *ignore);
-extern int lte_zero_real_refcnt(struct lookup_table_entry *entry, void *ignore);
-extern int lte_zero_extracted_file(struct lookup_table_entry *lte, void *ignore);
-extern int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignore);
-
-extern void print_lookup_table_entry(const struct lookup_table_entry *entry);
+extern int
+lte_zero_out_refcnt(struct lookup_table_entry *entry, void *ignore);
 
-extern int read_lookup_table(WIMStruct *w);
+extern int
+lte_zero_real_refcnt(struct lookup_table_entry *entry, void *ignore);
 
-extern void free_lookup_table(struct lookup_table *table);
+extern int
+lte_free_extracted_file(struct lookup_table_entry *lte, void *ignore);
 
-extern int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out);
+extern void
+inode_resolve_ltes(struct inode *inode, struct lookup_table *table);
 
-extern void free_lookup_table_entry(struct lookup_table_entry *lte);
+extern void
+inode_unresolve_ltes(struct inode *inode);
 
-extern int dentry_resolve_ltes(struct dentry *dentry, void *__table);
-extern int dentry_unresolve_ltes(struct dentry *dentry, void *ignore);
+extern int
+write_lookup_table_entry(struct lookup_table_entry *lte, void *__out);
 
-int write_lookup_table(struct lookup_table *table, FILE *out,
-		       struct resource_entry *out_res_entry);
-
-static inline struct resource_entry* wim_metadata_resource_entry(WIMStruct *w)
+static inline struct resource_entry*
+wim_metadata_resource_entry(WIMStruct *w)
 {
 	return &w->image_metadata[
 			w->current_image - 1].metadata_lte->resource_entry;
@@ -321,26 +340,13 @@ inode_stream_lte_unresolved(const struct inode *inode, unsigned stream_idx,
 					 inode->ads_entries[
 						stream_idx - 1].hash);
 }
-/*
- * Returns the lookup table entry for stream @stream_idx of the inode, where
- * stream_idx = 0 means the default un-named file stream, and stream_idx >= 1
- * corresponds to an alternate data stream.
- *
- * This works for both resolved and un-resolved dentries.
- */
-static inline struct lookup_table_entry *
-inode_stream_lte(const struct inode *inode, unsigned stream_idx,
-		 const struct lookup_table *table)
-{
-	if (inode->resolved)
-		return inode_stream_lte_resolved(inode, stream_idx);
-	else
-		return inode_stream_lte_unresolved(inode, stream_idx, table);
-}
 
+extern struct lookup_table_entry *
+inode_stream_lte(const struct inode *inode, unsigned stream_idx,
+		 const struct lookup_table *table);
 
-static inline const u8 *inode_stream_hash_unresolved(const struct inode *inode,
-						     unsigned stream_idx)
+static inline const u8 *
+inode_stream_hash_unresolved(const struct inode *inode, unsigned stream_idx)
 {
 	wimlib_assert(!inode->resolved);
 	wimlib_assert(stream_idx <= inode->num_ads);
@@ -351,8 +357,8 @@ static inline const u8 *inode_stream_hash_unresolved(const struct inode *inode,
 }
 
 
-static inline const u8 *inode_stream_hash_resolved(const struct inode *inode,
-						   unsigned stream_idx)
+static inline const u8 *
+inode_stream_hash_resolved(const struct inode *inode, unsigned stream_idx)
 {
 	struct lookup_table_entry *lte;
 	lte = inode_stream_lte_resolved(inode, stream_idx);
@@ -369,8 +375,8 @@ static inline const u8 *inode_stream_hash_resolved(const struct inode *inode,
  *
  * This works for both resolved and un-resolved dentries.
  */
-static inline const u8 *inode_stream_hash(const struct inode *inode,
-					  unsigned stream_idx)
+static inline const u8 *
+inode_stream_hash(const struct inode *inode, unsigned stream_idx)
 {
 	if (inode->resolved)
 		return inode_stream_hash_resolved(inode, stream_idx);
@@ -378,8 +384,8 @@ static inline const u8 *inode_stream_hash(const struct inode *inode,
 		return inode_stream_hash_unresolved(inode, stream_idx);
 }
 
-static inline u16 inode_stream_name_len(const struct inode *inode,
-					unsigned stream_idx)
+static inline u16
+inode_stream_name_len(const struct inode *inode, unsigned stream_idx)
 {
 	wimlib_assert(stream_idx <= inode->num_ads);
 	if (stream_idx == 0)
@@ -412,8 +418,9 @@ inode_unnamed_lte_unresolved(const struct inode *inode,
 }
 
 extern struct lookup_table_entry *
-inode_unnamed_lte(const struct inode *inode,
-		  const struct lookup_table *table);
+inode_unnamed_lte(const struct inode *inode, const struct lookup_table *table);
 
+extern u64
+lookup_table_total_stream_size(struct lookup_table *table);
 
 #endif