X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=abd0b86c11be76d4f2222ce7732a403671ea0914;hp=3ebf205ccf3617c01bbba84460b5fc1e492b407b;hb=de2db344b0d8a48b52c4cfaf0dbf35da9ffc6678;hpb=038eaccece575d04de8d647bb93773b7f3e38ce4

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 3ebf205c..abd0b86c 100644
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -31,10 +31,6 @@
 
 struct stat;
 
-#ifndef WIM_HASH_SIZE
-#define WIM_HASH_SIZE  20
-#endif
-
 #define WIM_MAGIC_LEN  8
 #define WIM_GID_LEN    16
 #define WIM_UNUSED_LEN 60
@@ -237,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. */
@@ -267,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;
 
 
@@ -285,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;
 }
@@ -307,22 +304,17 @@ 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];
 }
 
-/* Prints a hash code field. */
-static inline void print_hash(const u8 hash[])
-{
-	print_byte_field(hash, WIM_HASH_SIZE);
-}
-
 /* hardlink.c */
 
 struct link_group_table *new_link_group_table(u64 capacity);
 int link_group_table_insert(struct dentry *dentry,
-			    struct link_group_table *table);
+			    void *__table);
 void free_link_group_table(struct link_group_table *table);
 u64 assign_link_groups(struct link_group_table *table);
 int link_groups_free_duplicate_data(struct link_group_table *table);
@@ -347,45 +339,26 @@ extern void destroy_image_metadata(struct image_metadata *imd,
 extern const u8 *get_resource_entry(const u8 *p, struct resource_entry *entry);
 extern u8 *put_resource_entry(u8 *p, const struct resource_entry *entry);
 
-extern int read_resource(FILE *fp, u64 resource_size, 
-			 u64 resource_original_size,
-			 u64 resource_offset, int resource_ctype, u64 len, 
-			 u64 offset, void *contents_ret);
+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, bool raw);
 
-extern int read_uncompressed_resource(FILE *fp, u64 offset, u64 len, 
-					u8 contents_ret[]);
+extern int read_full_wim_resource(const struct lookup_table_entry *lte, u8 buf[]);
 
+extern int extract_wim_resource_to_fd(const struct lookup_table_entry *lte,
+				      int fd, u64 size);
 
-extern int extract_resource_to_fd(WIMStruct *w, 
-				  const struct resource_entry *entry, 
-				  int fd, 
-				  u64 size);
 
-extern int extract_full_resource_to_fd(WIMStruct *w, 
-				       const struct resource_entry *entry, 
-				       int fd);
+extern int extract_full_wim_resource_to_fd(const struct lookup_table_entry *lte,
+					   int fd);
 
 extern int read_metadata_resource(FILE *fp, int wim_ctype, 
 				  struct image_metadata *image_metadata);
 
-extern int resource_compression_type(int wim_ctype, int reshdr_flags);
-
-static inline int read_full_resource(FILE *fp, u64 resource_size, 
-				     u64 resource_original_size,
-				     u64 resource_offset, 
-				     int resource_ctype, void *contents_ret)
-{
-	return read_resource(fp, resource_size, resource_original_size, 
-				resource_offset, resource_ctype,
-				resource_original_size, 0, contents_ret);
-}
 
 extern int write_dentry_resources(struct dentry *dentry, void *wim_p);
 extern int copy_resource(struct lookup_table_entry *lte, void *w);
-extern int copy_between_files(FILE *in, off_t in_offset, FILE *out, size_t len);
-extern int write_resource_from_memory(const u8 resource[], int out_ctype,
-				      u64 resource_original_size, FILE *out,
-				      u64 *resource_size_ret);
 extern int write_metadata_resource(WIMStruct *w);
 
 
@@ -411,8 +384,6 @@ extern int dentry_set_symlink(struct dentry *dentry,
 extern WIMStruct *new_wim_struct();
 extern int wimlib_select_image(WIMStruct *w, int image);
 extern int wim_hdr_flags_compression_type(int wim_hdr_flags);
-extern int wim_resource_compression_type(const WIMStruct *w, 
-					 const struct resource_entry *entry);
 extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));
 
 /* write.c */