X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=23858d69b03c538261c64fee25e0db49030442f6;hp=af5098cb2f4f6af17b4aeeba4e20fc5d85fe8cbf;hb=71ac0d27d857d6de96d231fa41f4008f5654a998;hpb=fea0ee9f10fbcb85ff56ca06510e96186a7611ae

diff --git a/src/wim.c b/src/wim.c
index af5098cb..23858d69 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -1,5 +1,5 @@
 /*
- * wim.c
+ * wim.c - Stuff that doesn't fit into any other file
  */
 
 /*
@@ -43,13 +43,7 @@
 #include "lookup_table.h"
 #include "xml.h"
 
-static inline struct image_metadata *
-wim_get_current_image_metadata(WIMStruct *w)
-{
-	return &w->image_metadata[w->current_image - 1];
-}
-
-static int print_metadata(WIMStruct *w)
+static int image_print_metadata(WIMStruct *w)
 {
 	DEBUG("Printing metadata for image %d", w->current_image);
 	print_security_data(wim_security_data(w));
@@ -58,7 +52,7 @@ static int print_metadata(WIMStruct *w)
 }
 
 
-static int print_files(WIMStruct *w)
+static int image_print_files(WIMStruct *w)
 {
 	return for_dentry_in_tree(wim_root_dentry(w), print_dentry_full_path,
 				  NULL);
@@ -113,8 +107,8 @@ int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *))
 
 static int sort_image_metadata_by_position(const void *p1, const void *p2)
 {
-	const struct image_metadata *imd1 = p1;
-	const struct image_metadata *imd2 = p2;
+	const struct wim_image_metadata *imd1 = p1;
+	const struct wim_image_metadata *imd2 = p2;
 	u64 offset1 = imd1->metadata_lte->resource_entry.offset;
 	u64 offset2 = imd2->metadata_lte->resource_entry.offset;
 	if (offset1 < offset2)
@@ -129,7 +123,7 @@ static int sort_image_metadata_by_position(const void *p1, const void *p2)
  * If @lte points to a metadata resource, append it to the list of metadata
  * resources in the WIMStruct.  Otherwise, do nothing.
  */
-static int append_metadata_resource_entry(struct lookup_table_entry *lte,
+static int append_metadata_resource_entry(struct wim_lookup_table_entry *lte,
 					  void *wim_p)
 {
 	WIMStruct *w = wim_p;
@@ -174,7 +168,7 @@ static int wim_hdr_flags_compression_type(int wim_hdr_flags)
 WIMLIBAPI int wimlib_create_new_wim(int ctype, WIMStruct **w_ret)
 {
 	WIMStruct *w;
-	struct lookup_table *table;
+	struct wim_lookup_table *table;
 	int ret;
 
 	DEBUG("Creating new WIM with %s compression.",
@@ -209,7 +203,7 @@ WIMLIBAPI int wimlib_get_num_images(const WIMStruct *w)
 
 int select_wim_image(WIMStruct *w, int image)
 {
-	struct image_metadata *imd;
+	struct wim_image_metadata *imd;
 
 	DEBUG("Selecting image %d", image);
 
@@ -374,7 +368,7 @@ WIMLIBAPI int wimlib_print_metadata(WIMStruct *w, int image)
 		ERROR("Select the first part of the split WIM to see the metadata.");
 		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
 	}
-	return for_image(w, image, print_metadata);
+	return for_image(w, image, image_print_metadata);
 }
 
 WIMLIBAPI int wimlib_print_files(WIMStruct *w, int image)
@@ -385,7 +379,7 @@ WIMLIBAPI int wimlib_print_files(WIMStruct *w, int image)
 		ERROR("Select the first part of the split WIM if you'd like to list the files.");
 		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
 	}
-	return for_image(w, image, print_files);
+	return for_image(w, image, image_print_files);
 }
 
 /* Sets the index of the bootable image. */
@@ -501,7 +495,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int open_flags,
 
 	if (w->hdr.image_count != 0) {
 		w->image_metadata = CALLOC(w->hdr.image_count,
-					   sizeof(struct image_metadata));
+					   sizeof(struct wim_image_metadata));
 
 		if (!w->image_metadata) {
 			ERROR("Failed to allocate memory for %u image metadata structures",
@@ -521,7 +515,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int open_flags,
 		return ret;
 
 	/* Make sure all the expected images were found.  (We already have
-	 * returned false if *extra* images were found) */
+	 * returned WIMLIB_ERR_IMAGE_COUNT if *extra* images were found) */
 	if (w->current_image != w->hdr.image_count &&
 	    w->hdr.part_number == 1)
 	{
@@ -535,7 +529,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int open_flags,
 	 * file, rather than their order in the lookup table, which is random
 	 * because of hashing. */
 	qsort(w->image_metadata, w->current_image,
-	      sizeof(struct image_metadata), sort_image_metadata_by_position);
+	      sizeof(struct wim_image_metadata), sort_image_metadata_by_position);
 
 	w->current_image = WIMLIB_NO_IMAGE;
 
@@ -585,8 +579,8 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int open_flags,
 	return ret;
 }
 
-void destroy_image_metadata(struct image_metadata *imd,
-			    struct lookup_table *table)
+void destroy_image_metadata(struct wim_image_metadata *imd,
+			    struct wim_lookup_table *table)
 {
 	free_dentry_tree(imd->root_dentry, table);
 	free_security_data(imd->security_data);