X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwildcard.c;h=408b0fe32e73b1cd3df618c9be8b950a174633d7;hb=e65e912be5d6b5cc5e1256b60975d1ff579dee7b;hp=234ee91ce72d3eadb6fefc68caf4d654741116c4;hpb=ced16a28e197645a40fa04a54793d117a04526d7;p=wimlib

diff --git a/src/wildcard.c b/src/wildcard.c
index 234ee91c..408b0fe3 100644
--- a/src/wildcard.c
+++ b/src/wildcard.c
@@ -189,7 +189,7 @@ static int
 match_dentry(struct wim_dentry *cur_dentry, struct match_dentry_ctx *ctx)
 {
 	const tchar *name;
-	size_t name_len;
+	size_t name_nchars;
 	int ret;
 
 	if (cur_dentry->file_name_nbytes == 0)
@@ -197,15 +197,16 @@ match_dentry(struct wim_dentry *cur_dentry, struct match_dentry_ctx *ctx)
 
 	ret = utf16le_get_tstr(cur_dentry->file_name,
 			       cur_dentry->file_name_nbytes,
-			       &name, &name_len);
+			       &name, &name_nchars);
 	if (ret)
 		return ret;
-	name_len /= sizeof(tchar);
+	name_nchars /= sizeof(tchar);
 
-	if (match_wildcard(name,
-			   &ctx->wildcard_path[ctx->cur_component_offset],
-			   ctx->cur_component_len,
-			   ctx->case_insensitive))
+	if (do_match_wildcard(name,
+			      name_nchars,
+			      &ctx->wildcard_path[ctx->cur_component_offset],
+			      ctx->cur_component_len,
+			      ctx->case_insensitive))
 	{
 		switch (wildcard_status(&ctx->wildcard_path[
 				ctx->cur_component_offset +
@@ -326,7 +327,7 @@ expand_wildcard(WIMStruct *wim,
 	struct wim_dentry *root;
 	int ret;
 
-	root = wim_root_dentry(wim);
+	root = wim_get_current_root_dentry(wim);
 	if (root == NULL)
 		goto no_match;