X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=d105e8bacf1b250cee003e0d17ce8c2ff68e0663;hb=150fd376ac944f0fdc22c0df7beaa8dbd076061c;hp=5507b21242a703436992bf463268becc545f622a;hpb=3489da595e09caf8d6867661c45b4dab188f6ece;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 5507b212..d105e8ba 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -208,7 +208,9 @@ int wimlib_select_image(WIMStruct *w, int image)
 		if (!imd->modified) {
 			DEBUG("Freeing image %u", w->current_image);
 			destroy_image_metadata(imd, NULL);
-			memset(imd, 0, sizeof(*imd));
+			imd->root_dentry = NULL;
+			imd->security_data = NULL;
+			imd->lgt = NULL;
 		}
 	}
 
@@ -221,7 +223,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), 
@@ -526,7 +528,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;
 	}
@@ -538,7 +540,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;
@@ -550,11 +552,10 @@ 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++)
+		for (uint i = 0; i < w->hdr.image_count; i++)
 			destroy_image_metadata(&w->image_metadata[i], NULL);
 		FREE(w->image_metadata);
 	}