Remove some printing code from library

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index b36da84f2adb2196642d210c9436dfcd5a258f77..d885b7970988f6d6412cf1686b4f32c3d5c9c155 100644 (file)
--- 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;
 }
@@ -534,7 +519,7 @@ wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size)
 }
 
 static int
-do_open_wim(const tchar *filename, struct filedes *fd_ret)
+open_wim_file(const tchar *filename, struct filedes *fd_ret)
 {
        int raw_fd;
 
@@ -547,23 +532,6 @@ do_open_wim(const tchar *filename, struct filedes *fd_ret)
        return 0;
 }
 
-int
-reopen_wim(WIMStruct *wim)
-{
-       wimlib_assert(!filedes_valid(&wim->in_fd));
-       return do_open_wim(wim->filename, &wim->in_fd);
-}
-
-int
-close_wim(WIMStruct *wim)
-{
-       if (filedes_valid(&wim->in_fd)) {
-               filedes_close(&wim->in_fd);
-               filedes_invalidate(&wim->in_fd);
-       }
-       return 0;
-}
-
 /*
  * Begins the reading of a WIM file; opens the file and reads its header and
  * lookup table, and optionally checks the integrity.
@@ -582,7 +550,7 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
                wim->in_fd.is_pipe = 1;
        } else {
                wimfile = wim_filename_or_fd;
-               ret = do_open_wim(wimfile, &wim->in_fd);
+               ret = open_wim_file(wimfile, &wim->in_fd);
                if (ret)
                        return ret;