sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-05 12:22:11 +03:00
Code Activity

Avoid retrieving iconv convenience during loops.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-10-24 04:39:09 +02:00
parent 2d46992337
commit 5d146d0178
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/util/charset/util_unistr.c
View File

@ -24,10 +24,7 @@
static inline struct smb_iconv_convenience *get_iconv_convenience(void) static inline struct smb_iconv_convenience *get_iconv_convenience(void)
{ {
static struct smb_iconv_convenience *ic = NULL; return lp_iconv_convenience(global_loadparm);
if (ic == NULL)
ic = lp_iconv_convenience(global_loadparm);
return ic;
} }
/** /**
@ -190,9 +187,10 @@ _PUBLIC_ bool strcsequal_m(const char *s1,const char *s2)
**/ **/
_PUBLIC_ void string_replace_m(char *s, char oldc, char newc) _PUBLIC_ void string_replace_m(char *s, char oldc, char newc)
{ {
struct smb_iconv_convenience *ic = get_iconv_convenience();
while (s && *s) { while (s && *s) {
size_t size; size_t size;
codepoint_t c = next_codepoint(get_iconv_convenience(), s, &size); codepoint_t c = next_codepoint(ic, s, &size);
if (c == oldc) { if (c == oldc) {
*s = newc; *s = newc;
} }
@ -254,6 +252,7 @@ _PUBLIC_ char *alpha_strcpy(char *dest, const char *src, const char *other_safe_
_PUBLIC_ size_t strlen_m(const char *s) _PUBLIC_ size_t strlen_m(const char *s)
{ {
size_t count = 0; size_t count = 0;
struct smb_iconv_convenience *ic = get_iconv_convenience();
if (!s) { if (!s) {
return 0; return 0;
@ -270,7 +269,7 @@ _PUBLIC_ size_t strlen_m(const char *s)
while (*s) { while (*s) {
size_t c_size; size_t c_size;
codepoint_t c = next_codepoint(get_iconv_convenience(), s, &c_size); codepoint_t c = next_codepoint(ic, s, &c_size);
if (c < 0x10000) { if (c < 0x10000) {
count += 1; count += 1;
} else { } else {
@ -300,6 +299,7 @@ _PUBLIC_ size_t strlen_m_term(const char *s)
**/ **/
_PUBLIC_ char *strchr_m(const char *s, char c) _PUBLIC_ char *strchr_m(const char *s, char c)
{ {
struct smb_iconv_convenience *ic = get_iconv_convenience();
if (s == NULL) { if (s == NULL) {
return NULL; return NULL;
} }
@ -311,7 +311,7 @@ _PUBLIC_ char *strchr_m(const char *s, char c)
while (*s) { while (*s) {
size_t size; size_t size;
codepoint_t c2 = next_codepoint(get_iconv_convenience(), s, &size); codepoint_t c2 = next_codepoint(ic, s, &size);
if (c2 == c) { if (c2 == c) {
return discard_const_p(char, s); return discard_const_p(char, s);
} }
@ -326,6 +326,7 @@ _PUBLIC_ char *strchr_m(const char *s, char c)
*/ */
_PUBLIC_ char *strrchr_m(const char *s, char c) _PUBLIC_ char *strrchr_m(const char *s, char c)
{ {
struct smb_iconv_convenience *ic = get_iconv_convenience();
char *ret = NULL; char *ret = NULL;
if (s == NULL) { if (s == NULL) {
@ -340,7 +341,7 @@ _PUBLIC_ char *strrchr_m(const char *s, char c)
while (*s) { while (*s) {
size_t size; size_t size;
codepoint_t c2 = next_codepoint(get_iconv_convenience(), s, &size); codepoint_t c2 = next_codepoint(ic, s, &size);
if (c2 == c) { if (c2 == c) {
ret = discard_const_p(char, s); ret = discard_const_p(char, s);
} }
@ -355,12 +356,13 @@ _PUBLIC_ char *strrchr_m(const char *s, char c)
*/ */
_PUBLIC_ bool strhaslower(const char *string) _PUBLIC_ bool strhaslower(const char *string)
{ {
struct smb_iconv_convenience *ic = get_iconv_convenience();
while (*string) { while (*string) {
size_t c_size; size_t c_size;
codepoint_t s; codepoint_t s;
codepoint_t t; codepoint_t t;
s = next_codepoint(get_iconv_convenience(), string, &c_size); s = next_codepoint(ic, string, &c_size);
string += c_size; string += c_size;
t = toupper_m(s); t = toupper_m(s);
@ -378,12 +380,13 @@ _PUBLIC_ bool strhaslower(const char *string)
*/ */
_PUBLIC_ bool strhasupper(const char *string) _PUBLIC_ bool strhasupper(const char *string)
{ {
struct smb_iconv_convenience *ic = get_iconv_convenience();
while (*string) { while (*string) {
size_t c_size; size_t c_size;
codepoint_t s; codepoint_t s;
codepoint_t t; codepoint_t t;
s = next_codepoint(get_iconv_convenience(), string, &c_size); s = next_codepoint(ic, string, &c_size);
string += c_size; string += c_size;
t = tolower_m(s); t = tolower_m(s);
@ -583,11 +586,12 @@ _PUBLIC_ void strupper_m(char *s)
**/ **/
_PUBLIC_ size_t count_chars_m(const char *s, char c) _PUBLIC_ size_t count_chars_m(const char *s, char c)
{ {
struct smb_iconv_convenience *ic = get_iconv_convenience();
size_t count = 0; size_t count = 0;
while (*s) { while (*s) {
size_t size; size_t size;
codepoint_t c2 = next_codepoint(get_iconv_convenience(), s, &size); codepoint_t c2 = next_codepoint(ic, s, &size);
if (c2 == c) count++; if (c2 == c) count++;
s += size; s += size;
} }