Remove more uses of global_loadparm.

(This used to be commit 58a5b1de2b093fe642eb11d76d12db0edf60c25c)

1 files changed, 8 insertions, 7 deletions

diff --git a/source4/lib/util/ms_fnmatch.c b/source4/lib/util/ms_fnmatch.c
index 1fb57b07a4..5e04ec1f4b 100644
--- a/source4/lib/util/ms_fnmatch.c
+++ b/source4/lib/util/ms_fnmatch.c
@@ -64,8 +64,9 @@ static int ms_fnmatch_core(const char *p, const char *n,
 	codepoint_t c, c2;
 	int i;
 	size_t size, size_n;
+	struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
 
-	while ((c = next_codepoint(lp_iconv_convenience(global_loadparm), p, &size))) {
+	while ((c = next_codepoint(iconv_convenience, p, &size))) {
 		p += size;
 
 		switch (c) {
@@ -75,7 +76,7 @@ static int ms_fnmatch_core(const char *p, const char *n,
 				return null_match(p);
 			}
 			for (i=0; n[i]; i += size_n) {
-				next_codepoint(lp_iconv_convenience(global_loadparm), n+i, &size_n);
+				next_codepoint(iconv_convenience, n+i, &size_n);
 				if (ms_fnmatch_core(p, n+i, max_n+1, ldot) == 0) {
 					return 0;
 				}
@@ -94,7 +95,7 @@ static int ms_fnmatch_core(const char *p, const char *n,
 				return -1;
 			}
 			for (i=0; n[i]; i += size_n) {
-				next_codepoint(lp_iconv_convenience(global_loadparm), n+i, &size_n);
+				next_codepoint(iconv_convenience, n+i, &size_n);
 				if (ms_fnmatch_core(p, n+i, max_n+1, ldot) == 0) return 0;
 				if (n+i == ldot) {
 					if (ms_fnmatch_core(p, n+i+size_n, max_n+1, ldot) == 0) return 0;
@@ -110,7 +111,7 @@ static int ms_fnmatch_core(const char *p, const char *n,
 			if (! *n) {
 				return -1;
 			}
-			next_codepoint(lp_iconv_convenience(global_loadparm), n, &size_n);
+			next_codepoint(iconv_convenience, n, &size_n);
 			n += size_n;
 			break;
 
@@ -124,7 +125,7 @@ static int ms_fnmatch_core(const char *p, const char *n,
 				break;
 			}
 			if (! *n) return null_match(p);
-			next_codepoint(lp_iconv_convenience(global_loadparm), n, &size_n);
+			next_codepoint(iconv_convenience, n, &size_n);
 			n += size_n;
 			break;
 
@@ -134,12 +135,12 @@ static int ms_fnmatch_core(const char *p, const char *n,
 				return 0;
 			}
 			if (*n != '.') return -1;
-			next_codepoint(lp_iconv_convenience(global_loadparm), n, &size_n);
+			next_codepoint(iconv_convenience, n, &size_n);
 			n += size_n;
 			break;
 
 		default:
-			c2 = next_codepoint(lp_iconv_convenience(global_loadparm), n, &size_n);
+			c2 = next_codepoint(iconv_convenience, n, &size_n);
 			if (c != c2 && codepoint_cmpi(c, c2) != 0) {
 				return -1;
 			}