NTFS apply updates

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 4271cd492b122a3b456eb521081eb1da2f59228a..abd0b86c11be76d4f2222ce7732a403671ea0914 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -233,19 +233,19 @@ struct image_metadata {
 typedef struct WIMStruct {
 
        /* A pointer to the file indicated by @filename, opened for reading. */
-       FILE                *fp;
+       FILE  *fp;
 
        /* FILE pointer for the WIM file that is being written. */
        FILE  *out_fp;
 
        /* The name of the WIM file that has been opened. */
-       char                *filename;
+       char  *filename;
 
        /* The lookup table for the WIM file. */ 
        struct lookup_table *lookup_table;
 
        /* Pointer to the XML data read from the WIM file. */
-       u8                  *xml_data;
+       u8    *xml_data;
 
        /* Information retrieved from the XML data, arranged
         * in an orderly manner. */
@@ -263,14 +263,14 @@ typedef struct WIMStruct {
        union {
                int extract_flags;
                int add_flags;
+               int write_flags;
+               bool write_metadata;
        };
 
        /* The currently selected image, indexed starting at 1.  If not 0,
         * subtract 1 from this to get the index of the current image in the
         * image_metadata array. */
        int current_image;
-
-       bool write_metadata;
 } WIMStruct;
 
 
@@ -281,12 +281,13 @@ static inline struct dentry *wim_root_dentry(WIMStruct *w)
        return w->image_metadata[w->current_image - 1].root_dentry;
 }
 
-static inline struct dentry **wim_root_dentry_p(WIMStruct *w)
+static inline struct wim_security_data *
+wim_security_data(WIMStruct *w)
 {
-       return &w->image_metadata[w->current_image - 1].root_dentry;
+       return w->image_metadata[w->current_image - 1].security_data;
 }
-
-static inline struct wim_security_data *wim_security_data(WIMStruct *w)
+static inline const struct wim_security_data *
+wim_const_security_data(const WIMStruct *w)
 {
        return w->image_metadata[w->current_image - 1].security_data;
 }
@@ -303,7 +304,8 @@ static inline int resource_is_compressed(const struct resource_entry *entry)
        return (entry->flags & WIM_RESHDR_FLAG_COMPRESSED);
 }
 
-static inline struct image_metadata *wim_get_current_image_metadata(WIMStruct *w)
+static inline struct image_metadata *
+wim_get_current_image_metadata(WIMStruct *w)
 {
        return &w->image_metadata[w->current_image - 1];
 }
@@ -340,7 +342,7 @@ extern u8 *put_resource_entry(u8 *p, const struct resource_entry *entry);
 extern int read_uncompressed_resource(FILE *fp, u64 offset, u64 size, u8 buf[]);
 
 extern int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[],
-                     size_t size, u64 offset);
+                            size_t size, u64 offset, bool raw);
 
 extern int read_full_wim_resource(const struct lookup_table_entry *lte, u8 buf[]);