X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=d885b7970988f6d6412cf1686b4f32c3d5c9c155;hp=f118e793086774c289eddd9bbf607b0f5caefd9e;hb=2850f8933244f6c63f608eec612ad804e01072e1;hpb=66e2060915368055778438e3cacacee611a4b162

diff --git a/src/wim.c b/src/wim.c
index f118e793..d885b797 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -55,15 +55,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-static int
-image_print_metadata(WIMStruct *wim)
-{
-	DEBUG("Printing metadata for image %d", wim->current_image);
-	print_wim_security_data(wim_security_data(wim));
-	return for_dentry_in_tree(wim_root_dentry(wim), print_dentry,
-				  wim->lookup_table);
-}
-
 static int
 wim_default_pack_compression_type(void)
 {
@@ -276,11 +267,6 @@ select_wim_image(WIMStruct *wim, int image)
 	if (imd->root_dentry || imd->modified) {
 		ret = 0;
 	} else {
-		#ifdef ENABLE_DEBUG
-		DEBUG("Reading metadata resource specified by the following "
-		      "lookup table entry:");
-		print_lookup_table_entry(imd->metadata_lte, stderr);
-		#endif
 		ret = read_metadata_resource(wim, imd);
 		if (ret)
 			wim->current_image = WIMLIB_NO_IMAGE;
@@ -364,12 +350,11 @@ wimlib_print_available_images(const WIMStruct *wim, int image)
 		print_image_info(wim->wim_info, i);
 }
 
-
-/* API function documented in wimlib.h  */
+/* TODO: Deprecated; remove this.  */
 WIMLIBAPI int
 wimlib_print_metadata(WIMStruct *wim, int image)
 {
-	return for_image(wim, image, image_print_metadata);
+	return WIMLIB_ERR_UNSUPPORTED;
 }
 
 /* API function documented in wimlib.h  */
@@ -469,7 +454,7 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 		return ret;
 
 	/* Reset the chunk size if it's no longer valid.  */
-	if (!wim_chunk_size_valid(ctype, wim->out_chunk_size))
+	if (!wim_chunk_size_valid(wim->out_chunk_size, ctype))
 		wim->out_chunk_size = wim_default_chunk_size(ctype);
 	return 0;
 }
@@ -483,7 +468,7 @@ wimlib_set_output_pack_compression_type(WIMStruct *wim, int ctype)
 		return ret;
 
 	/* Reset the chunk size if it's no longer valid.  */
-	if (!wim_chunk_size_valid(ctype, wim->out_pack_chunk_size))
+	if (!wim_chunk_size_valid(wim->out_pack_chunk_size, ctype))
 		wim->out_pack_chunk_size = wim_default_pack_chunk_size(ctype);
 	return 0;
 }