summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/util/charset/charset.h10
-rw-r--r--lib/util/charset/codepoints.c118
-rw-r--r--lib/util/charset/config.mk2
-rw-r--r--lib/util/charset/tests/charset.c64
-rw-r--r--lib/util/charset/util_unistr.c148
-rw-r--r--source4/libnet/libnet_user.h2
-rw-r--r--source4/ntvfs/posix/pvfs_util.c2
7 files changed, 189 insertions, 157 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index a4028270f1..4f7167736a 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -88,12 +88,12 @@ size_t strlen_m_term(const char *s);
size_t strlen_m(const char *s);
char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength);
void string_replace_m(char *s, char oldc, char newc);
-bool strcsequal_w(const char *s1,const char *s2);
-bool strequal_w(const char *s1, const char *s2);
+bool strcsequal_m(const char *s1,const char *s2);
+bool strequal_m(const char *s1, const char *s2);
int strncasecmp_m(const char *s1, const char *s2, size_t n);
bool next_token(const char **ptr,char *buff, const char *sep, size_t bufsize);
int strcasecmp_m(const char *s1, const char *s2);
-size_t count_chars_w(const char *s, char c);
+size_t count_chars_m(const char *s, char c);
void strupper_m(char *s);
void strlower_m(char *s);
char *strupper_talloc(TALLOC_CTX *ctx, const char *src);
@@ -110,8 +110,8 @@ codepoint_t next_codepoint(struct smb_iconv_convenience *ic,
const char *str, size_t *size);
ssize_t push_codepoint(struct smb_iconv_convenience *ic,
char *str, codepoint_t c);
-codepoint_t toupper_w(codepoint_t val);
-codepoint_t tolower_w(codepoint_t val);
+codepoint_t toupper_m(codepoint_t val);
+codepoint_t tolower_m(codepoint_t val);
int codepoint_cmpi(codepoint_t c1, codepoint_t c2);
ssize_t push_string(struct smb_iconv_convenience *ic, void *dest, const char *src, size_t dest_len, int flags);
ssize_t pull_string(struct smb_iconv_convenience *ic,
diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
new file mode 100644
index 0000000000..a940c1baf0
--- /dev/null
+++ b/lib/util/charset/codepoints.c
@@ -0,0 +1,118 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ Copyright (C) Andrew Tridgell 1992-2001
+ Copyright (C) Simo Sorce 2001
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "system/locale.h"
+#include "dynconfig/dynconfig.h"
+
+/**
+ * @file
+ * @brief Unicode string manipulation
+ */
+
+/* these 2 tables define the unicode case handling. They are loaded
+ at startup either via mmap() or read() from the lib directory */
+static void *upcase_table;
+static void *lowcase_table;
+
+
+/*******************************************************************
+load the case handling tables
+********************************************************************/
+void load_case_tables(void)
+{
+ TALLOC_CTX *mem_ctx;
+
+ mem_ctx = talloc_init("load_case_tables");
+ if (!mem_ctx) {
+ smb_panic("No memory for case_tables");
+ }
+ upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat", dyn_DATADIR), 0x20000);
+ lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat", dyn_DATADIR), 0x20000);
+ talloc_free(mem_ctx);
+ if (upcase_table == NULL) {
+ /* try also under codepages for testing purposes */
+ upcase_table = map_file("codepages/upcase.dat", 0x20000);
+ if (upcase_table == NULL) {
+ upcase_table = (void *)-1;
+ }
+ }
+ if (lowcase_table == NULL) {
+ /* try also under codepages for testing purposes */
+ lowcase_table = map_file("codepages/lowcase.dat", 0x20000);
+ if (lowcase_table == NULL) {
+ lowcase_table = (void *)-1;
+ }
+ }
+}
+
+/**
+ Convert a codepoint_t to upper case.
+**/
+_PUBLIC_ codepoint_t toupper_m(codepoint_t val)
+{
+ if (val < 128) {
+ return toupper(val);
+ }
+ if (upcase_table == NULL) {
+ load_case_tables();
+ }
+ if (upcase_table == (void *)-1) {
+ return val;
+ }
+ if (val & 0xFFFF0000) {
+ return val;
+ }
+ return SVAL(upcase_table, val*2);
+}
+
+/**
+ Convert a codepoint_t to lower case.
+**/
+_PUBLIC_ codepoint_t tolower_m(codepoint_t val)
+{
+ if (val < 128) {
+ return tolower(val);
+ }
+ if (lowcase_table == NULL) {
+ load_case_tables();
+ }
+ if (lowcase_table == (void *)-1) {
+ return val;
+ }
+ if (val & 0xFFFF0000) {
+ return val;
+ }
+ return SVAL(lowcase_table, val*2);
+}
+
+/**
+ compare two codepoints case insensitively
+*/
+_PUBLIC_ int codepoint_cmpi(codepoint_t c1, codepoint_t c2)
+{
+ if (c1 == c2 ||
+ toupper_m(c1) == toupper_m(c2)) {
+ return 0;
+ }
+ return c1 - c2;
+}
+
+
diff --git a/lib/util/charset/config.mk b/lib/util/charset/config.mk
index 56e0e7b36c..952c13a84d 100644
--- a/lib/util/charset/config.mk
+++ b/lib/util/charset/config.mk
@@ -6,6 +6,6 @@ PRIVATE_DEPENDENCIES = DYNCONFIG
# End SUBSYSTEM CHARSET
################################################
-CHARSET_OBJ_FILES = $(addprefix $(libcharsetsrcdir)/, iconv.o charcnv.o util_unistr.o)
+CHARSET_OBJ_FILES = $(addprefix $(libcharsetsrcdir)/, iconv.o charcnv.o util_unistr.o codepoints.o)
PUBLIC_HEADERS += $(libcharsetsrcdir)/charset.h
diff --git a/lib/util/charset/tests/charset.c b/lib/util/charset/tests/charset.c
index e7e4dd7cc8..06acda80ab 100644
--- a/lib/util/charset/tests/charset.c
+++ b/lib/util/charset/tests/charset.c
@@ -21,19 +21,19 @@
#include "includes.h"
#include "torture/torture.h"
-static bool test_toupper_w(struct torture_context *tctx)
+static bool test_toupper_m(struct torture_context *tctx)
{
- torture_assert_int_equal(tctx, toupper_w('c'), 'C', "c");
- torture_assert_int_equal(tctx, toupper_w('Z'), 'Z', "z");
- torture_assert_int_equal(tctx, toupper_w(0xFFFF4565), 0xFFFF4565, "0xFFFF4565");
+ torture_assert_int_equal(tctx, toupper_m('c'), 'C', "c");
+ torture_assert_int_equal(tctx, toupper_m('Z'), 'Z', "z");
+ torture_assert_int_equal(tctx, toupper_m(0xFFFF4565), 0xFFFF4565, "0xFFFF4565");
return true;
}
-static bool test_tolower_w(struct torture_context *tctx)
+static bool test_tolower_m(struct torture_context *tctx)
{
- torture_assert_int_equal(tctx, tolower_w('C'), 'c', "c");
- torture_assert_int_equal(tctx, tolower_w('z'), 'z', "z");
- torture_assert_int_equal(tctx, tolower_w(0xFFFF4565), 0xFFFF4565, "0xFFFF4565");
+ torture_assert_int_equal(tctx, tolower_m('C'), 'c', "c");
+ torture_assert_int_equal(tctx, tolower_m('z'), 'z', "z");
+ torture_assert_int_equal(tctx, tolower_m(0xFFFF4565), 0xFFFF4565, "0xFFFF4565");
return true;
}
@@ -58,25 +58,25 @@ static bool test_strcasecmp_m(struct torture_context *tctx)
}
-static bool test_strequal_w(struct torture_context *tctx)
+static bool test_strequal_m(struct torture_context *tctx)
{
- torture_assert(tctx, !strequal_w("foo", "bar"), "different strings");
- torture_assert(tctx, strequal_w("foo", "foo"), "same case strings");
- torture_assert(tctx, strequal_w("foo", "Foo"), "different case strings");
- torture_assert(tctx, !strequal_w(NULL, "Foo"), "one NULL");
- torture_assert(tctx, !strequal_w("foo", NULL), "other NULL");
- torture_assert(tctx, strequal_w(NULL, NULL), "both NULL");
+ torture_assert(tctx, !strequal_m("foo", "bar"), "different strings");
+ torture_assert(tctx, strequal_m("foo", "foo"), "same case strings");
+ torture_assert(tctx, strequal_m("foo", "Foo"), "different case strings");
+ torture_assert(tctx, !strequal_m(NULL, "Foo"), "one NULL");
+ torture_assert(tctx, !strequal_m("foo", NULL), "other NULL");
+ torture_assert(tctx, strequal_m(NULL, NULL), "both NULL");
return true;
}
-static bool test_strcsequal_w(struct torture_context *tctx)
+static bool test_strcsequal_m(struct torture_context *tctx)
{
- torture_assert(tctx, !strcsequal_w("foo", "bar"), "different strings");
- torture_assert(tctx, strcsequal_w("foo", "foo"), "same case strings");
- torture_assert(tctx, !strcsequal_w("foo", "Foo"), "different case strings");
- torture_assert(tctx, !strcsequal_w(NULL, "Foo"), "one NULL");
- torture_assert(tctx, !strcsequal_w("foo", NULL), "other NULL");
- torture_assert(tctx, strcsequal_w(NULL, NULL), "both NULL");
+ torture_assert(tctx, !strcsequal_m("foo", "bar"), "different strings");
+ torture_assert(tctx, strcsequal_m("foo", "foo"), "same case strings");
+ torture_assert(tctx, !strcsequal_m("foo", "Foo"), "different case strings");
+ torture_assert(tctx, !strcsequal_m(NULL, "Foo"), "one NULL");
+ torture_assert(tctx, !strcsequal_m("foo", NULL), "other NULL");
+ torture_assert(tctx, strcsequal_m(NULL, NULL), "both NULL");
return true;
}
@@ -235,12 +235,12 @@ static bool test_strhasupper(struct torture_context *tctx)
return true;
}
-static bool test_count_chars_w(struct torture_context *tctx)
+static bool test_count_chars_m(struct torture_context *tctx)
{
- torture_assert_int_equal(tctx, count_chars_w("foo", 'o'), 2, "simple");
- torture_assert_int_equal(tctx, count_chars_w("", 'o'), 0, "empty");
- torture_assert_int_equal(tctx, count_chars_w("bla", 'o'), 0, "none");
- torture_assert_int_equal(tctx, count_chars_w("bla", '\0'), 0, "null");
+ torture_assert_int_equal(tctx, count_chars_m("foo", 'o'), 2, "simple");
+ torture_assert_int_equal(tctx, count_chars_m("", 'o'), 0, "empty");
+ torture_assert_int_equal(tctx, count_chars_m("bla", 'o'), 0, "none");
+ torture_assert_int_equal(tctx, count_chars_m("bla", '\0'), 0, "null");
return true;
}
@@ -248,12 +248,12 @@ struct torture_suite *torture_local_charset(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
- torture_suite_add_simple_test(suite, "toupper_w", test_toupper_w);
- torture_suite_add_simple_test(suite, "tolower_w", test_tolower_w);
+ torture_suite_add_simple_test(suite, "toupper_m", test_toupper_m);
+ torture_suite_add_simple_test(suite, "tolower_m", test_tolower_m);
torture_suite_add_simple_test(suite, "codepoint_cmpi", test_codepoint_cmpi);
torture_suite_add_simple_test(suite, "strcasecmp_m", test_strcasecmp_m);
- torture_suite_add_simple_test(suite, "strequal_w", test_strequal_w);
- torture_suite_add_simple_test(suite, "strcsequal_w", test_strcsequal_w);
+ torture_suite_add_simple_test(suite, "strequal_m", test_strequal_m);
+ torture_suite_add_simple_test(suite, "strcsequal_m", test_strcsequal_m);
torture_suite_add_simple_test(suite, "string_replace_m", test_string_replace_m);
torture_suite_add_simple_test(suite, "strncasecmp_m", test_strncasecmp_m);
torture_suite_add_simple_test(suite, "next_token", test_next_token);
@@ -266,7 +266,7 @@ struct torture_suite *torture_local_charset(TALLOC_CTX *mem_ctx)
torture_suite_add_simple_test(suite, "strlen_m_term", test_strlen_m_term);
torture_suite_add_simple_test(suite, "strhaslower", test_strhaslower);
torture_suite_add_simple_test(suite, "strhasupper", test_strhasupper);
- torture_suite_add_simple_test(suite, "count_chars_w", test_count_chars_w);
+ torture_suite_add_simple_test(suite, "count_chars_m", test_count_chars_m);
return suite;
}
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index 7fee71cc8d..c53c13b7d0 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -20,100 +20,14 @@
#include "includes.h"
#include "system/locale.h"
-#include "dynconfig/dynconfig.h"
#include "param/param.h"
-/**
- * @file
- * @brief Unicode string manipulation
- */
-
-/* these 2 tables define the unicode case handling. They are loaded
- at startup either via mmap() or read() from the lib directory */
-static void *upcase_table;
-static void *lowcase_table;
-
-
-/*******************************************************************
-load the case handling tables
-********************************************************************/
-void load_case_tables(void)
-{
- TALLOC_CTX *mem_ctx;
-
- mem_ctx = talloc_init("load_case_tables");
- if (!mem_ctx) {
- smb_panic("No memory for case_tables");
- }
- upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat", dyn_DATADIR), 0x20000);
- lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat", dyn_DATADIR), 0x20000);
- talloc_free(mem_ctx);
- if (upcase_table == NULL) {
- /* try also under codepages for testing purposes */
- upcase_table = map_file("codepages/upcase.dat", 0x20000);
- if (upcase_table == NULL) {
- upcase_table = (void *)-1;
- }
- }
- if (lowcase_table == NULL) {
- /* try also under codepages for testing purposes */
- lowcase_table = map_file("codepages/lowcase.dat", 0x20000);
- if (lowcase_table == NULL) {
- lowcase_table = (void *)-1;
- }
- }
-}
-
-/**
- Convert a codepoint_t to upper case.
-**/
-_PUBLIC_ codepoint_t toupper_w(codepoint_t val)
-{
- if (val < 128) {
- return toupper(val);
- }
- if (upcase_table == NULL) {
- load_case_tables();
- }
- if (upcase_table == (void *)-1) {
- return val;
- }
- if (val & 0xFFFF0000) {
- return val;
- }
- return SVAL(upcase_table, val*2);
-}
-
-/**
- Convert a codepoint_t to lower case.
-**/
-_PUBLIC_ codepoint_t tolower_w(codepoint_t val)
-{
- if (val < 128) {
- return tolower(val);
- }
- if (lowcase_table == NULL) {
- load_case_tables();
- }
- if (lowcase_table == (void *)-1) {
- return val;
- }
- if (val & 0xFFFF0000) {
- return val;
- }
- return SVAL(lowcase_table, val*2);
-}
-
-/**
- compare two codepoints case insensitively
-*/
-_PUBLIC_ int codepoint_cmpi(codepoint_t c1, codepoint_t c2)
+static inline struct smb_iconv_convenience *get_iconv_convenience(void)
{
- if (c1 == c2 ||
- toupper_w(c1) == toupper_w(c2)) {
- return 0;
- }
- return c1 - c2;
+ static struct smb_iconv_convenience *ic = NULL;
+ if (ic == NULL)
+ ic = lp_iconv_convenience(global_loadparm);
+ return ic;
}
/**
@@ -123,7 +37,7 @@ _PUBLIC_ int strcasecmp_m(const char *s1, const char *s2)
{
codepoint_t c1=0, c2=0;
size_t size1, size2;
- struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
+ struct smb_iconv_convenience *iconv_convenience = get_iconv_convenience();
/* handle null ptr comparisons to simplify the use in qsort */
if (s1 == s2) return 0;
@@ -147,7 +61,7 @@ _PUBLIC_ int strcasecmp_m(const char *s1, const char *s2)
return strcasecmp(s1, s2);
}
- if (toupper_w(c1) != toupper_w(c2)) {
+ if (toupper_m(c1) != toupper_m(c2)) {
return c1 - c2;
}
}
@@ -208,7 +122,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n)
{
codepoint_t c1=0, c2=0;
size_t size1, size2;
- struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
+ struct smb_iconv_convenience *iconv_convenience = get_iconv_convenience();
/* handle null ptr comparisons to simplify the use in qsort */
if (s1 == s2) return 0;
@@ -234,7 +148,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n)
return strcasecmp(s1, s2);
}
- if (toupper_w(c1) != toupper_w(c2)) {
+ if (toupper_m(c1) != toupper_m(c2)) {
return c1 - c2;
}
}
@@ -251,7 +165,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n)
*
* @note The comparison is case-insensitive.
**/
-_PUBLIC_ bool strequal_w(const char *s1, const char *s2)
+_PUBLIC_ bool strequal_m(const char *s1, const char *s2)
{
return strcasecmp_m(s1,s2) == 0;
}
@@ -259,7 +173,7 @@ _PUBLIC_ bool strequal_w(const char *s1, const char *s2)
/**
Compare 2 strings (case sensitive).
**/
-_PUBLIC_ bool strcsequal_w(const char *s1,const char *s2)
+_PUBLIC_ bool strcsequal_m(const char *s1,const char *s2)
{
if (s1 == s2)
return true;
@@ -278,7 +192,7 @@ _PUBLIC_ void string_replace_m(char *s, char oldc, char newc)
{
while (s && *s) {
size_t size;
- codepoint_t c = next_codepoint(lp_iconv_convenience(global_loadparm), s, &size);
+ codepoint_t c = next_codepoint(get_iconv_convenience(), s, &size);
if (c == oldc) {
*s = newc;
}
@@ -356,7 +270,7 @@ _PUBLIC_ size_t strlen_m(const char *s)
while (*s) {
size_t c_size;
- codepoint_t c = next_codepoint(lp_iconv_convenience(global_loadparm), s, &c_size);
+ codepoint_t c = next_codepoint(get_iconv_convenience(), s, &c_size);
if (c < 0x10000) {
count += 1;
} else {
@@ -397,7 +311,7 @@ _PUBLIC_ char *strchr_m(const char *s, char c)
while (*s) {
size_t size;
- codepoint_t c2 = next_codepoint(lp_iconv_convenience(global_loadparm), s, &size);
+ codepoint_t c2 = next_codepoint(get_iconv_convenience(), s, &size);
if (c2 == c) {
return discard_const_p(char, s);
}
@@ -426,7 +340,7 @@ _PUBLIC_ char *strrchr_m(const char *s, char c)
while (*s) {
size_t size;
- codepoint_t c2 = next_codepoint(lp_iconv_convenience(global_loadparm), s, &size);
+ codepoint_t c2 = next_codepoint(get_iconv_convenience(), s, &size);
if (c2 == c) {
ret = discard_const_p(char, s);
}
@@ -446,10 +360,10 @@ _PUBLIC_ bool strhaslower(const char *string)
codepoint_t s;
codepoint_t t;
- s = next_codepoint(lp_iconv_convenience(global_loadparm), string, &c_size);
+ s = next_codepoint(get_iconv_convenience(), string, &c_size);
string += c_size;
- t = toupper_w(s);
+ t = toupper_m(s);
if (s != t) {
return true; /* that means it has lower case chars */
@@ -469,10 +383,10 @@ _PUBLIC_ bool strhasupper(const char *string)
codepoint_t s;
codepoint_t t;
- s = next_codepoint(lp_iconv_convenience(global_loadparm), string, &c_size);
+ s = next_codepoint(get_iconv_convenience(), string, &c_size);
string += c_size;
- t = tolower_w(s);
+ t = tolower_m(s);
if (s != t) {
return true; /* that means it has upper case chars */
@@ -489,7 +403,7 @@ _PUBLIC_ char *strlower_talloc(TALLOC_CTX *ctx, const char *src)
{
size_t size=0;
char *dest;
- struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
+ struct smb_iconv_convenience *iconv_convenience = get_iconv_convenience();
/* this takes advantage of the fact that upper/lower can't
change the length of a character by more than 1 byte */
@@ -503,7 +417,7 @@ _PUBLIC_ char *strlower_talloc(TALLOC_CTX *ctx, const char *src)
codepoint_t c = next_codepoint(iconv_convenience, src, &c_size);
src += c_size;
- c = tolower_w(c);
+ c = tolower_m(c);
c_size = push_codepoint(iconv_convenience, dest+size, c);
if (c_size == -1) {
@@ -531,7 +445,7 @@ _PUBLIC_ char *strupper_talloc_n(TALLOC_CTX *ctx, const char *src, size_t n)
{
size_t size=0;
char *dest;
- struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
+ struct smb_iconv_convenience *iconv_convenience = get_iconv_convenience();
if (!src) {
return NULL;
@@ -549,7 +463,7 @@ _PUBLIC_ char *strupper_talloc_n(TALLOC_CTX *ctx, const char *src, size_t n)
codepoint_t c = next_codepoint(iconv_convenience, src, &c_size);
src += c_size;
- c = toupper_w(c);
+ c = toupper_m(c);
c_size = push_codepoint(iconv_convenience, dest+size, c);
if (c_size == -1) {
@@ -605,17 +519,17 @@ _PUBLIC_ void strlower_m(char *s)
if (!*s)
return;
- iconv_convenience = lp_iconv_convenience(global_loadparm);
+ iconv_convenience = get_iconv_convenience();
d = s;
while (*s) {
size_t c_size, c_size2;
codepoint_t c = next_codepoint(iconv_convenience, s, &c_size);
- c_size2 = push_codepoint(iconv_convenience, d, tolower_w(c));
+ c_size2 = push_codepoint(iconv_convenience, d, tolower_m(c));
if (c_size2 > c_size) {
DEBUG(0,("FATAL: codepoint 0x%x (0x%x) expanded from %d to %d bytes in strlower_m\n",
- c, tolower_w(c), (int)c_size, (int)c_size2));
+ c, tolower_m(c), (int)c_size, (int)c_size2));
smb_panic("codepoint expansion in strlower_m\n");
}
s += c_size;
@@ -644,17 +558,17 @@ _PUBLIC_ void strupper_m(char *s)
if (!*s)
return;
- iconv_convenience = lp_iconv_convenience(global_loadparm);
+ iconv_convenience = get_iconv_convenience();
d = s;
while (*s) {
size_t c_size, c_size2;
codepoint_t c = next_codepoint(iconv_convenience, s, &c_size);
- c_size2 = push_codepoint(iconv_convenience, d, toupper_w(c));
+ c_size2 = push_codepoint(iconv_convenience, d, toupper_m(c));
if (c_size2 > c_size) {
DEBUG(0,("FATAL: codepoint 0x%x (0x%x) expanded from %d to %d bytes in strupper_m\n",
- c, toupper_w(c), (int)c_size, (int)c_size2));
+ c, toupper_m(c), (int)c_size, (int)c_size2));
smb_panic("codepoint expansion in strupper_m\n");
}
s += c_size;
@@ -667,13 +581,13 @@ _PUBLIC_ void strupper_m(char *s)
/**
Find the number of 'c' chars in a string
**/
-_PUBLIC_ size_t count_chars_w(const char *s, char c)
+_PUBLIC_ size_t count_chars_m(const char *s, char c)
{
size_t count = 0;
while (*s) {
size_t size;
- codepoint_t c2 = next_codepoint(lp_iconv_convenience(global_loadparm), s, &size);
+ codepoint_t c2 = next_codepoint(get_iconv_convenience(), s, &size);
if (c2 == c) count++;
s += size;
}
diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h
index 7095160004..4aad654b3b 100644
--- a/source4/libnet/libnet_user.h
+++ b/source4/libnet/libnet_user.h
@@ -67,7 +67,7 @@ struct libnet_ModifyUser {
#define SET_FIELD_LSA_STRING(new, current, mod, field, flag) \
if (new.field != NULL && \
- !strequal_w(current->field.string, new.field)) { \
+ !strequal_m(current->field.string, new.field)) { \
\
mod->field = talloc_strdup(mem_ctx, new.field); \
if (mod->field == NULL) return NT_STATUS_NO_MEMORY; \
diff --git a/source4/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c
index b52c3e387b..720ddaaa7b 100644
--- a/source4/ntvfs/posix/pvfs_util.c
+++ b/source4/ntvfs/posix/pvfs_util.c
@@ -183,7 +183,7 @@ uint32_t pvfs_name_hash(const char *key, size_t length)
while (*key && length--) {
size_t c_size;
codepoint_t c = next_codepoint(lp_iconv_convenience(global_loadparm), key, &c_size);
- c = toupper_w(c);
+ c = toupper_m(c);
value *= fnv1_prime;
value ^= (uint32_t)c;
key += c_size;
generated by cgit (git 2.34.1) at 2024-06-25 05:23:20 +0000