From 9a23ab0c8f362ca68a45e8b4a9a973b418972cb6 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 18 Dec 2012 22:04:16 -0600 Subject: [PATCH] Rename some functions used in for_image() --- src/wim.c | 8 ++++---- src/write.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wim.c b/src/wim.c index 5a38688b..72b03c0e 100644 --- a/src/wim.c +++ b/src/wim.c @@ -43,7 +43,7 @@ #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)); @@ -52,7 +52,7 @@ 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); @@ -368,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) @@ -379,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. */ diff --git a/src/write.c b/src/write.c index 86454841..e7f69667 100644 --- a/src/write.c +++ b/src/write.c @@ -1395,7 +1395,7 @@ static int dentry_find_streams_to_write(struct dentry *dentry, return 0; } -static int find_streams_to_write(WIMStruct *w) +static int image_find_streams_to_write(WIMStruct *w) { return for_dentry_in_tree(wim_root_dentry(w), dentry_find_streams_to_write, w); @@ -1409,7 +1409,7 @@ static int write_wim_streams(WIMStruct *w, int image, int write_flags, for_lookup_table_entry(w->lookup_table, lte_zero_out_refcnt, NULL); LIST_HEAD(stream_list); w->private = &stream_list; - for_image(w, image, find_streams_to_write); + for_image(w, image, image_find_streams_to_write); return write_stream_list(&stream_list, w->out_fp, wimlib_get_compression_type(w), write_flags, num_threads, progress_func); -- 2.43.0