X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=933cfd73032f20f927c06aced94709eb3ec83e93;hb=81be60d782a4b4b8ae2e40141fc42b6e0e2d2706;hp=268b3811fa711d2b4f895ed5d7627e7d60cad82f;hpb=6f7956a06fcf92a304fae93e393e8eaee34e92d5;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 268b3811..933cfd73 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -32,9 +32,7 @@
 
 static int print_metadata(WIMStruct *w)
 {
-#ifdef ENABLE_SECURITY_DATA
 	print_security_data(wim_security_data(w));
-#endif
 	return for_dentry_in_tree(wim_root_dentry(w), print_dentry, 
 				  w->lookup_table);
 }
@@ -48,14 +46,7 @@ static int print_files(WIMStruct *w)
 
 WIMStruct *new_wim_struct()
 {
-	WIMStruct *w;
-	
-	w = CALLOC(1, sizeof(WIMStruct));
-	if (!w)
-		return NULL;
-	w->link_type     = WIM_LINK_TYPE_NONE;
-	w->current_image = WIM_NO_IMAGE;
-	return w;
+	return CALLOC(1, sizeof(WIMStruct));
 }
 
 /* 
@@ -81,14 +72,14 @@ int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *))
 		i = image;
 		end = image;
 	}
-	do {
+	for (; i <= end; i++) {
 		ret = wimlib_select_image(w, i);
 		if (ret != 0)
 			return ret;
 		ret = visitor(w);
 		if (ret != 0)
 			return ret;
-	} while (i++ != end);
+	}
 	return 0;
 }
 
@@ -116,6 +107,7 @@ static int append_metadata_resource_entry(struct lookup_table_entry *lte,
 	WIMStruct *w = wim_p;
 
 	if (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) {
+		/*fprintf(stderr, "found mlte at %u\n", lte->resource_entry.offset);*/
 		if (w->current_image == w->hdr.image_count) {
 			ERROR("Expected only %u images, but found more",
 			      w->hdr.image_count);
@@ -147,18 +139,6 @@ int wim_hdr_flags_compression_type(int wim_hdr_flags)
 	}
 }
 
-int wim_resource_compression_type(const WIMStruct *w, 
-				  const struct resource_entry *entry)
-{
-	int wim_ctype = wimlib_get_compression_type(w);
-	return resource_compression_type(wim_ctype, entry->flags);
-}
-
-WIMLIBAPI void wimlib_set_verbose(WIMStruct *w, bool verbose)
-{
-	w->verbose = verbose;
-}
-
 /*
  * Creates a WIMStruct for a new WIM file.
  */
@@ -220,12 +200,10 @@ int wimlib_select_image(WIMStruct *w, int image)
 		imd = wim_get_current_image_metadata(w);
 		if (!imd->modified) {
 			DEBUG("Freeing image %u", w->current_image);
-			free_dentry_tree(imd->root_dentry, NULL, false);
+			destroy_image_metadata(imd, NULL);
 			imd->root_dentry = NULL;
-#ifdef ENABLE_SECURITY_DATA
-			free_security_data(imd->security_data);
 			imd->security_data = NULL;
-#endif
+			imd->lgt = NULL;
 		}
 	}
 
@@ -238,7 +216,7 @@ int wimlib_select_image(WIMStruct *w, int image)
 		#ifdef ENABLE_DEBUG
 		DEBUG("Reading metadata resource specified by the following "
 		      "lookup table entry:");
-		print_lookup_table_entry(imd->metadata_lte, NULL);
+		print_lookup_table_entry(imd->metadata_lte);
 		#endif
 		return read_metadata_resource(w->fp, 
 					      wimlib_get_compression_type(w), 
@@ -409,7 +387,8 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int flags)
 	w->fp = fopen(in_wim_path, "rb");
 
 	if (!w->fp) {
-		ERROR_WITH_ERRNO("Failed to open the file `%s' for reading");
+		ERROR_WITH_ERRNO("Failed to open the file `%s' for reading",
+				 in_wim_path);
 		return WIMLIB_ERR_OPEN;
 	}
 
@@ -458,9 +437,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int flags)
 		return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
 	}
 
-	ret = read_lookup_table(w->fp, w->hdr.lookup_table_res_entry.offset,
-				w->hdr.lookup_table_res_entry.size, 
-				&w->lookup_table);
+	ret = read_lookup_table(w);
 	if (ret != 0)
 		return ret;
 
@@ -542,7 +519,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int flags,
 
 	ret = begin_read(w, wim_file, flags);
 	if (ret != 0) {
-		ERROR("Could not begin reading the WIM file `%s'", wim_file);
+		DEBUG("Could not begin reading the WIM file `%s'", wim_file);
 		wimlib_free(w);
 		return ret;
 	}
@@ -554,7 +531,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int flags,
  * closes all files associated with the WIMStruct.  */
 WIMLIBAPI void wimlib_free(WIMStruct *w)
 {
-	uint i;
+	DEBUG("Freeing WIMStruct");
 
 	if (!w)
 		return;
@@ -566,17 +543,11 @@ WIMLIBAPI void wimlib_free(WIMStruct *w)
 	free_lookup_table(w->lookup_table);
 
 	FREE(w->filename);
-	FREE(w->output_dir);
 	FREE(w->xml_data);
 	free_wim_info(w->wim_info);
 	if (w->image_metadata) {
-		for (i = 0; i < w->hdr.image_count; i++) {
-			free_dentry_tree(w->image_metadata[i].root_dentry, 
-					 NULL, false);
-			#ifdef ENABLE_SECURITY_DATA
-			free_security_data(w->image_metadata[i].security_data);
-			#endif
-		}
+		for (uint i = 0; i < w->hdr.image_count; i++)
+			destroy_image_metadata(&w->image_metadata[i], NULL);
 		FREE(w->image_metadata);
 	}
 	FREE(w);