diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-29 15:08:09 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-29 15:08:09 +0400 |
| commit | 2c2b14f9a2ca44e9e0d5c4eeb16f63305a4d535c (patch) | |
| tree | 8f169a00789a20a5778e1bd68b7cc7ae9e045e55 /strings/strto.c | |
| parent | 231553039f63832fda515edfb80670de178da794 (diff) | |
| download | mariadb-git-2c2b14f9a2ca44e9e0d5c4eeb16f63305a4d535c.tar.gz | |
Reorganization to restore generating charset C files from conf files
Diffstat (limited to 'strings/strto.c')
| -rw-r--r-- | strings/strto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/strings/strto.c b/strings/strto.c index cd8dee53692..8b838fd00f9 100644 --- a/strings/strto.c +++ b/strings/strto.c @@ -95,7 +95,7 @@ function (const char *nptr,char **endptr,int base) s = nptr; /* Skip white space. */ - while (my_isspace (system_charset_info, *s)) + while (my_isspace (my_charset_latin1, *s)) ++s; if (*s == '\0') { @@ -115,7 +115,7 @@ function (const char *nptr,char **endptr,int base) } - if (base == 16 && s[0] == '0' && my_toupper (system_charset_info, s[1]) == 'X') + if (base == 16 && s[0] == '0' && my_toupper (my_charset_latin1, s[1]) == 'X') s += 2; /* If BASE is zero, figure it out ourselves. */ @@ -123,7 +123,7 @@ function (const char *nptr,char **endptr,int base) { if (*s == '0') { - if (my_toupper (system_charset_info, s[1]) == 'X') + if (my_toupper (my_charset_latin1, s[1]) == 'X') { s += 2; base = 16; @@ -145,10 +145,10 @@ function (const char *nptr,char **endptr,int base) i = 0; for (c = *s; c != '\0'; c = *++s) { - if (my_isdigit (system_charset_info, c)) + if (my_isdigit (my_charset_latin1, c)) c -= '0'; - else if (my_isalpha (system_charset_info, c)) - c = my_toupper (system_charset_info, c) - 'A' + 10; + else if (my_isalpha (my_charset_latin1, c)) + c = my_toupper (my_charset_latin1, c) - 'A' + 10; else break; if (c >= base) |