diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 1 | ||||
| -rw-r--r-- | mysys/default.c | 10 | ||||
| -rw-r--r-- | mysys/mf_iocache2.c | 2 | ||||
| -rw-r--r-- | mysys/my_error.c | 2 | ||||
| -rw-r--r-- | mysys/my_getwd.c | 2 | ||||
| -rw-r--r-- | mysys/my_init.c | 2 | ||||
| -rw-r--r-- | mysys/typelib.c | 4 |
7 files changed, 11 insertions, 12 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 7baacd613b4..9b628ce0177 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -408,7 +408,6 @@ char *get_charsets_dir(char *buf) CHARSET_INFO *all_charsets[256]; CHARSET_INFO *default_charset_info = &my_charset_latin1; -CHARSET_INFO *system_charset_info = &my_charset_latin1; #define MY_ADD_CHARSET(x) all_charsets[(x)->number]=(x) diff --git a/mysys/default.c b/mysys/default.c index 06557f73d06..0ae409f1015 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -249,7 +249,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, { line++; /* Ignore comment and empty lines */ - for (ptr=buff ; my_isspace(system_charset_info,*ptr) ; ptr++ ) ; + for (ptr=buff ; my_isspace(&my_charset_latin1,*ptr) ; ptr++ ) ; if (*ptr == '#' || *ptr == ';' || !*ptr) continue; if (*ptr == '[') /* Group name */ @@ -262,7 +262,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, name,line); goto err; } - for ( ; my_isspace(system_charset_info,end[-1]) ; end--) ;/* Remove end space */ + for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;/* Remove end space */ end[0]=0; read_values=find_type(ptr,group,3) > 0; continue; @@ -278,7 +278,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, continue; if (!(end=value=strchr(ptr,'='))) end=strend(ptr); /* Option without argument */ - for ( ; my_isspace(system_charset_info,end[-1]) ; end--) ; + for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ; if (!value) { if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3))) @@ -291,9 +291,9 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, { /* Remove pre- and end space */ char *value_end; - for (value++ ; my_isspace(system_charset_info,*value); value++) ; + for (value++ ; my_isspace(&my_charset_latin1,*value); value++) ; value_end=strend(value); - for ( ; my_isspace(system_charset_info,value_end[-1]) ; value_end--) ; + for ( ; my_isspace(&my_charset_latin1,value_end[-1]) ; value_end--) ; if (value_end < value) /* Empty string */ value_end=value; if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3 + diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 8a7dfc7be09..bce08b9795b 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -267,7 +267,7 @@ uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args) /* Found one '%' */ } /* Skipp if max size is used (to be compatible with printf) */ - while (my_isdigit(system_charset_info, *fmt) || *fmt == '.' || *fmt == '-') + while (my_isdigit(&my_charset_latin1, *fmt) || *fmt == '.' || *fmt == '-') fmt++; if (*fmt == 's') /* String parameter */ { diff --git a/mysys/my_error.c b/mysys/my_error.c index cd41589f366..6fd346c89f7 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -69,7 +69,7 @@ int my_error(int nr,myf MyFlags, ...) else { /* Skipp if max size is used (to be compatible with printf) */ - while (my_isdigit(system_charset_info, *tpos) || *tpos == '.' || *tpos == '-') + while (my_isdigit(&my_charset_latin1, *tpos) || *tpos == '.' || *tpos == '-') tpos++; if (*tpos == 'l') /* Skipp 'l' argument */ tpos++; diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c index adf131c5fd0..a08d28d8545 100644 --- a/mysys/my_getwd.c +++ b/mysys/my_getwd.c @@ -109,7 +109,7 @@ int my_setwd(const char *dir, myf MyFlags) uint drive,drives; pos++; /* Skipp FN_DEVCHAR */ - drive=(uint) (my_toupper(system_charset_info,dir[0])-'A'+1); + drive=(uint) (my_toupper(&my_charset_latin1,dir[0])-'A'+1); drives= (uint) -1; if ((pos-(byte*) dir) == 2 && drive > 0 && drive < 32) { diff --git a/mysys/my_init.c b/mysys/my_init.c index ec7cae46d53..fa1beaa3e35 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -52,7 +52,7 @@ my_bool my_init_done=0; static ulong atoi_octal(const char *str) { long int tmp; - while (*str && my_isspace(system_charset_info, *str)) + while (*str && my_isspace(&my_charset_latin1, *str)) str++; str2int(str, (*str == '0' ? 8 : 10), /* Octalt or decimalt */ diff --git a/mysys/typelib.c b/mysys/typelib.c index e524f903b5d..e32fad8742f 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -48,8 +48,8 @@ int find_type(my_string x, TYPELIB *typelib, uint full_name) for (pos=0 ; (j=typelib->type_names[pos]) ; pos++) { for (i=x ; - *i && my_toupper(system_charset_info,*i) == - my_toupper(system_charset_info,*j) ; i++, j++) ; + *i && my_toupper(&my_charset_latin1,*i) == + my_toupper(&my_charset_latin1,*j) ; i++, j++) ; if (! *j) { while (*i == ' ') |