diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 16:12:14 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 16:12:14 +0200 |
| commit | f7692d16e3dc5e580364852c709c6c4a371dd32e (patch) | |
| tree | 0001b4dd1efb01850740b4ef0038fe5d2b5a92c5 /lib/util | |
| parent | ea474647f80e145996155ff74c3b8918b6f45e21 (diff) | |
| download | samba-f7692d16e3dc5e580364852c709c6c4a371dd32e.tar.gz samba-f7692d16e3dc5e580364852c709c6c4a371dd32e.tar.bz2 samba-f7692d16e3dc5e580364852c709c6c4a371dd32e.zip | |
Remove more global_loadparm instances, fix syntax errors.
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/charset/charset.h | 2 | ||||
| -rw-r--r-- | lib/util/charset/util_unistr.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index f8b3f65548..21fc20b8c3 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -124,7 +124,7 @@ ssize_t convert_string(charset_t from, charset_t to, extern struct smb_iconv_convenience *global_iconv_convenience; -_PUBLIC_ codepoint_t next_codepoint(const char *str, size_t *size); +codepoint_t next_codepoint(const char *str, size_t *size); /* codepoints */ codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic, diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c index c90b675ded..86a76f831e 100644 --- a/lib/util/charset/util_unistr.c +++ b/lib/util/charset/util_unistr.c @@ -133,7 +133,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n) n--; c1 = next_codepoint_convenience(iconv_convenience, s1, &size1); - c2 = next_codepoint_convenienceconv_convenience, s2, &size2); + c2 = next_codepoint_convenience(iconv_convenience, s2, &size2); s1 += size1; s2 += size2; @@ -272,7 +272,7 @@ _PUBLIC_ size_t strlen_m(const char *s) while (*s) { size_t c_size; - codepoint_t c = next_codepoint(ic, s, &c_size); + codepoint_t c = next_codepoint_convenience(ic, s, &c_size); if (c < 0x10000) { count += 1; } else { @@ -344,7 +344,7 @@ _PUBLIC_ char *strrchr_m(const char *s, char c) while (*s) { size_t size; - codepoint_t c2 = next_codepoint(ic, s, &size); + codepoint_t c2 = next_codepoint_convenience(ic, s, &size); if (c2 == c) { ret = discard_const_p(char, s); } @@ -466,7 +466,7 @@ _PUBLIC_ char *strupper_talloc_n(TALLOC_CTX *ctx, const char *src, size_t n) while (*src && n--) { size_t c_size; - codepoint_t c = next_codepoint(iconv_convenience, src, &c_size); + codepoint_t c = next_codepoint_convenience(iconv_convenience, src, &c_size); src += c_size; c = toupper_m(c); |