ntfs-apply.c: Tweak NTFS inode closing some more

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index c72648414f5d641303a9f91f647e035ca016590d..72b03c0e483af0fa65e6f177f1846529c2b23f4a 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -3,7 +3,6 @@
  */
 
 /*
- * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * wimlib - Library for working with WIM files
@@ -40,11 +39,11 @@
 #endif
 
 #include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
 #include "lookup_table.h"
 #include "xml.h"
 
-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));
@@ -53,13 +52,13 @@ 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);
 }
 
-WIMStruct *new_wim_struct()
+static WIMStruct *new_wim_struct()
 {
        WIMStruct *w = CALLOC(1, sizeof(WIMStruct));
 #ifdef WITH_FUSE
@@ -149,7 +148,7 @@ static int append_metadata_resource_entry(struct lookup_table_entry *lte,
 }
 
 /* Returns the compression type given in the flags of a WIM header. */
-int wim_hdr_flags_compression_type(int wim_hdr_flags)
+static int wim_hdr_flags_compression_type(int wim_hdr_flags)
 {
        if (wim_hdr_flags & WIM_HDR_FLAG_COMPRESSION) {
                if (wim_hdr_flags & WIM_HDR_FLAG_COMPRESS_LZX)
@@ -369,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)
@@ -380,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. */