X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fcapture.h;h=4d3a60aba8dfe92ae7c1f7017407eba3cbafb1f0;hb=5d3d469e410dc5f4a28814ad231336fc174cba56;hp=9f9e4617fb44111b3fdcc3f2bfffdb84a7072666;hpb=5816eba3f41b63910c5d932a8ed22a2c9f65c492;p=wimlib diff --git a/include/wimlib/capture.h b/include/wimlib/capture.h index 9f9e4617..4d3a60ab 100644 --- a/include/wimlib/capture.h +++ b/include/wimlib/capture.h @@ -2,6 +2,7 @@ #define _WIMLIB_CAPTURE_H #include "wimlib.h" +#include "wimlib/inode_table.h" #include "wimlib/list.h" #include "wimlib/security.h" #include "wimlib/util.h" @@ -10,35 +11,16 @@ struct wim_lookup_table; struct wim_dentry; struct wim_inode; -/* Hash table to find inodes, given an inode number (in the case of reading - * a WIM images), or both an inode number and a device number (in the case of - * capturing a WIM image). */ -struct wim_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. - * - * - Groups we create ourselves by splitting a nominal inode due to - * inconsistencies in the dentries. These inodes will share an inode - * number with some other inode until assign_inode_numbers() is - * called. - */ - struct list_head extra_inodes; -}; - /* Common parameters to implementations of building an in-memory dentry tree * from an on-disk directory structure. */ struct add_image_params { - /* Pointer to the lookup table of the WIM. */ + /* Pointer to the lookup table of the WIM. */ struct wim_lookup_table *lookup_table; + /* List of streams that have been added so far, but without their SHA1 + * message digests being calculated (as a shortcut). */ + struct list_head *unhashed_streams; + /* Hash table of inodes that have been captured for this tree so far. */ struct wim_inode_table inode_table; @@ -103,12 +85,6 @@ extern void inode_table_prepare_inode_list(struct wim_inode_table *table, struct list_head *head); -static inline void -destroy_inode_table(struct wim_inode_table *table) -{ - FREE(table->array); -} - #ifdef WITH_NTFS_3G /* ntfs-3g_capture.c */