wimlib_select_image() => select_wim_image()

wimlib_select_image() has for some time no longer been an external function, so
rename it to select_wim_image().

diff --git a/src/extract.c b/src/extract.c
index 2f7a5d838f9dbcea3099e281b213667b84811b12..07c6d3def7db7c7363c75fd1b0680b0b4845d680 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -340,7 +340,7 @@ static int extract_single_image(WIMStruct *w, int image,
        DEBUG("Extracting image %d", image);
 
        int ret;
-       ret = wimlib_select_image(w, image);
+       ret = select_wim_image(w, image);
        if (ret != 0)
                return ret;
 

diff --git a/src/modify.c b/src/modify.c
index e945e8e874f8f170e3938ffe47b70611ae6628e0..a8ac048ff8d68f280f3da79624782a415137fa4d 100644 (file)
--- a/src/modify.c
+++ b/src/modify.c
@@ -417,7 +417,7 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry,
        /* Change the current image to the new one.  There should not be any
         * ways for this to fail, since the image is valid and the dentry tree
         * is already in memory. */
-       ret = wimlib_select_image(w, w->hdr.image_count);
+       ret = select_wim_image(w, w->hdr.image_count);
        wimlib_assert(ret == 0);
        return ret;
 out_free_metadata_lte:
@@ -535,7 +535,7 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
                src_wim->lookup_table = joined_tab;
        }
 
-       ret = wimlib_select_image(src_wim, src_image);
+       ret = select_wim_image(src_wim, src_image);
        if (ret != 0) {
                ERROR("Could not select image %d from the WIM `%s' "
                      "to export it", src_image, src_wim->filename);
@@ -627,7 +627,7 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image)
        /* Even if the dentry tree is not allocated, we must select it (and
         * therefore allocate it) so that we can decrement the reference counts
         * in the lookup table.  */
-       ret = wimlib_select_image(w, image);
+       ret = select_wim_image(w, image);
        if (ret != 0)
                return ret;
 

diff --git a/src/mount.c b/src/mount.c
index 478d1f643e63505b712f5b8d1dd1dce26316c6c2..f2dad8d3714d945726d4e9c35f4d767cdfa06a4e 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -1729,7 +1729,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
                wim->lookup_table = joined_tab;
        }
 
-       ret = wimlib_select_image(wim, image);
+       ret = select_wim_image(wim, image);
 
        if (ret != 0)
                goto out;

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index d6271f79094795d12a4788ee646f8aca0be814a0..91e364f07012a2f83330812672713cb0682677de 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -774,7 +774,7 @@ WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image,
                w->lookup_table = joined_tab;
        }
 
-       ret = wimlib_select_image(w, image);
+       ret = select_wim_image(w, image);
        if (ret != 0)
                goto out;
 

diff --git a/src/wim.c b/src/wim.c
index 557cda9c498da09adabfb3daac514396a06cac91..fe2164957c1f80880f2fff9b49af85ba9f0a7f9c 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -79,7 +79,7 @@ int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *))
                end = image;
        }
        for (; i <= end; i++) {
-               ret = wimlib_select_image(w, i);
+               ret = select_wim_image(w, i);
                if (ret != 0)
                        return ret;
                ret = visitor(w);
@@ -184,7 +184,7 @@ WIMLIBAPI int wimlib_get_num_images(const WIMStruct *w)
        return w->hdr.image_count;
 }
 
-int wimlib_select_image(WIMStruct *w, int image)
+int select_wim_image(WIMStruct *w, int image)
 {
        struct image_metadata *imd;
 

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 4e2f1d26d311fe9fa819190234f8a9ac633faee9..d9a00220b28d57b0b301a600c0baf81327cae606 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -466,7 +466,7 @@ extern int inode_set_symlink(struct inode *inode,
 
 /* wim.c */
 extern WIMStruct *new_wim_struct();
-extern int wimlib_select_image(WIMStruct *w, int image);
+extern int select_wim_image(WIMStruct *w, int image);
 extern int wim_hdr_flags_compression_type(int wim_hdr_flags);
 extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));