wimlib_select_image() => select_wim_image()

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 2c67ebabb4edf5b267a27f0fb747e6b77aa2dc10..fe2164957c1f80880f2fff9b49af85ba9f0a7f9c 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -24,16 +24,20 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "io.h"
-#include "lookup_table.h"
-#include "xml.h"
+#include "config.h"
 #include <stdlib.h>
+#include <stdarg.h>
 
 #ifdef WITH_NTFS_3G
 #include <ntfs-3g/volume.h>
 #endif
 
+#include "wimlib_internal.h"
+#include "io.h"
+#include "lookup_table.h"
+#include "xml.h"
+
+
 static int print_metadata(WIMStruct *w)
 {
        print_security_data(wim_security_data(w));
@@ -75,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);
@@ -180,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;
 
@@ -205,7 +209,6 @@ int wimlib_select_image(WIMStruct *w, int image)
                        destroy_image_metadata(imd, NULL);
                        imd->root_dentry = NULL;
                        imd->security_data = NULL;
-                       imd->lgt = NULL;
                }
        }
 
@@ -259,7 +262,8 @@ WIMLIBAPI int wimlib_resolve_image(WIMStruct *w, const char *image_name_or_num)
        if (!image_name_or_num)
                return WIM_NO_IMAGE;
 
-       if (strcmp(image_name_or_num, "all") == 0)
+       if (strcmp(image_name_or_num, "all") == 0
+           || strcmp(image_name_or_num, "*") == 0)
                return WIM_ALL_IMAGES;
        image = strtol(image_name_or_num, &p, 10);
        if (p != image_name_or_num && *p == '\0') {