extract_wim_resource() refactor

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 7f2ee17809b4cba4ae670cf787022843e52efef2..9d25e1e9c34e4b5c5087da5decedcab9ed4646d8 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -320,6 +320,12 @@ wim_const_security_data(const WIMStruct *w)
        return w->image_metadata[w->current_image - 1].security_data;
 }
 
+static inline struct image_metadata *
+wim_get_current_image_metadata(WIMStruct *w)
+{
+       return &w->image_metadata[w->current_image - 1];
+}
+
 /* Nonzero if a struct resource_entry indicates a compressed resource. */
 static inline int resource_is_compressed(const struct resource_entry *entry)
 {
@@ -358,36 +364,10 @@ extern int add_new_dentry_tree(WIMStruct *dest_wim, struct dentry *root,
 
 /* hardlink.c */
 
-/* Hash table to find inodes, identified by their inode ID.
- * */
-struct inode_table {
-       /* Fields for the hash table */
-       struct hlist_head *array;
-       u64 num_entries;
-       u64 capacity;
-
-       /*
-        * Linked list of "extra" inodes.  These may be:
-        *
-        * - inodes with link count 1, which are all allowed to have 0 for their
-        *   inode number, meaning we cannot insert them into the hash table
-        *   before calling assign_inode_numbers().
-         *
-        * - Groups we create ourselves by splitting a nominal inode due to
-        *   inconsistencies in the dentries.  These inodes will share a inode
-        *   ID with some other inode until assign_inode_numbers() is called.
-        */
-       struct hlist_head extra_inodes;
-};
-
-extern int init_inode_table(struct inode_table *table, size_t capacity);
-static inline void destroy_inode_table(struct inode_table *table)
-{
-       FREE(table->array);
-}
-extern int inode_table_insert(struct dentry *dentry, void *__table);
 extern u64 assign_inode_numbers(struct hlist_head *inode_list);
-extern int fix_inodes(struct inode_table *table, struct hlist_head *inode_list);
+
+extern int dentry_tree_fix_inodes(struct dentry *root,
+                                 struct hlist_head *inode_list);
 
 /* header.c */
 extern int read_header(FILE *fp, struct wim_header *hdr, int split_ok);
@@ -416,6 +396,12 @@ extern int new_joined_lookup_table(WIMStruct *w,
                                   unsigned num_additional_swms,
                                   struct lookup_table **table_ret);
 
+/* metadata_resource.c */
+
+extern int read_metadata_resource(WIMStruct *w,
+                                 struct image_metadata *image_metadata);
+extern int write_metadata_resource(WIMStruct *w);
+
 /* ntfs-apply.c */
 
 struct apply_args {
@@ -467,20 +453,32 @@ extern int write_wim_resource(struct lookup_table_entry *lte,
                              struct resource_entry *out_res_entry,
                              int flags);
 
-extern int extract_wim_resource_to_fd(const struct lookup_table_entry *lte,
-                                     int fd, u64 size);
 
+typedef int (*extract_chunk_func_t)(const u8 *, size_t, u64, void *);
 
-extern int extract_full_wim_resource_to_fd(const struct lookup_table_entry *lte,
-                                          int fd);
+extern int extract_wim_chunk_to_fd(const u8 *buf, size_t len,
+                                  u64 offset, void *arg);
 
-extern int read_metadata_resource(WIMStruct *w,
-                                 struct image_metadata *image_metadata);
+extern int extract_wim_resource(const struct lookup_table_entry *lte,
+                               u64 size, extract_chunk_func_t extract_chunk,
+                               void *extract_chunk_arg);
+/*
+ * Extracts the first @size bytes of the WIM resource specified by @lte to the
+ * open file descriptor @fd.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
+static inline int
+extract_wim_resource_to_fd(const struct lookup_table_entry *lte,
+                          int fd, u64 size)
+{
+       return extract_wim_resource(lte, size,
+                                   extract_wim_chunk_to_fd, &fd);
+}
 
 
 extern int write_dentry_resources(struct dentry *dentry, void *wim_p);
 extern int copy_resource(struct lookup_table_entry *lte, void *w);
-extern int write_metadata_resource(WIMStruct *w);
 
 
 /* security.c */