X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fdentry.h;h=1e4b1b939fb613caf423fea250be357531b914c7;hb=b79d426cd90c506974f6c956a9af141b5d257d42;hp=2dd98fb458a8d21716b7c9cf34ed38b991a30ca5;hpb=57318a10de8d50cd338fa4c0e4e0b9f60e7c0143;p=wimlib diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index 2dd98fb4..1e4b1b93 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -10,8 +10,6 @@ struct wim_inode; struct wim_lookup_table; -struct wim_lookup_table_entry; -struct wim_security_data; /* Base size of a WIM dentry in the on-disk format, up to and including the file * name length. This does not include the variable-length file name, short @@ -99,14 +97,15 @@ struct wim_dentry { /* Used by wimlib_update_image() */ u8 is_orphan : 1; - /* Temporary list field */ - struct list_head tmp_list; + union { + /* 'subdir_offset' is only used while reading and writing this + * dentry. See the corresponding field in `struct + * wim_dentry_on_disk' for explanation. */ + u64 subdir_offset; - /* 'length' and 'subdir_offset' are only used while reading and writing - * this dentry; see the corresponding field in - * `struct wim_dentry_on_disk' for explanation. */ - u64 length; - u64 subdir_offset; + /* Temporary list field */ + struct list_head tmp_list; + }; /* Full path to this dentry in the WIM, in platform-dependent tchars * that can be printed without conversion. By default this field will @@ -153,11 +152,6 @@ for_dentry_in_tree(struct wim_dentry *root, int (*visitor)(struct wim_dentry*, void*), void *args); -extern int -for_dentry_in_tree_depth(struct wim_dentry *root, - int (*visitor)(struct wim_dentry*, void*), - void *args); - /* Iterate through each @child dentry of the @dir directory inode, * in sorted order (by case sensitive name). */ #define for_inode_child(child, dir) \ @@ -219,20 +213,6 @@ extern struct wim_dentry * get_parent_dentry(struct WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type); -#ifdef WITH_FUSE - -#define LOOKUP_FLAG_ADS_OK 0x00000001 -#define LOOKUP_FLAG_DIRECTORY_OK 0x00000002 - -extern int -wim_pathname_to_stream(WIMStruct *wim, - const tchar *path, - int lookup_flags, - struct wim_dentry **dentry_ret, - struct wim_lookup_table_entry **lte_ret, - u16 *stream_idx_ret); -#endif - extern int calculate_dentry_full_path(struct wim_dentry *dentry);