Commit e6c2ca31 authored by unknown's avatar unknown

Use always base "10" to remove base guesser in strntoul() implementation


strings/ctype-simple.c:
  Hide unused code
strings/ctype-utf8.c:
  Hide unused code
parent 57ab67de
...@@ -213,10 +213,12 @@ long my_strntol_8bit(CHARSET_INFO *cs, ...@@ -213,10 +213,12 @@ long my_strntol_8bit(CHARSET_INFO *cs,
register unsigned char c; register unsigned char c;
const char *save, *e; const char *save, *e;
int overflow; int overflow;
#if 0
if (base < 0 || base == 1 || base > 36) if (base < 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
s = nptr; s = nptr;
e = nptr+l; e = nptr+l;
...@@ -241,9 +243,12 @@ long my_strntol_8bit(CHARSET_INFO *cs, ...@@ -241,9 +243,12 @@ long my_strntol_8bit(CHARSET_INFO *cs,
else else
negative = 0; negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x')) if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
s += 2; s += 2;
#endif
#if 0
if (base == 0) if (base == 0)
{ {
if (*s == '0') if (*s == '0')
...@@ -259,6 +264,7 @@ long my_strntol_8bit(CHARSET_INFO *cs, ...@@ -259,6 +264,7 @@ long my_strntol_8bit(CHARSET_INFO *cs,
else else
base = 10; base = 10;
} }
#endif
save = s; save = s;
cutoff = ((ulong)~0L) / (unsigned long int) base; cutoff = ((ulong)~0L) / (unsigned long int) base;
...@@ -330,9 +336,11 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs, ...@@ -330,9 +336,11 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
const char *save, *e; const char *save, *e;
int overflow; int overflow;
#if 0
if (base < 0 || base == 1 || base > 36) if (base < 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
s = nptr; s = nptr;
e = nptr+l; e = nptr+l;
...@@ -356,9 +364,12 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs, ...@@ -356,9 +364,12 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
else else
negative = 0; negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x')) if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
s += 2; s += 2;
#endif
#if 0
if (base == 0) if (base == 0)
{ {
if (*s == '0') if (*s == '0')
...@@ -374,6 +385,7 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs, ...@@ -374,6 +385,7 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
else else
base = 10; base = 10;
} }
#endif
save = s; save = s;
cutoff = ((ulong)~0L) / (unsigned long int) base; cutoff = ((ulong)~0L) / (unsigned long int) base;
...@@ -437,8 +449,10 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -437,8 +449,10 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
const char *save; const char *save;
int overflow; int overflow;
#if 0
if (base < 0 || base == 1 || base > 36) if (base < 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
s = nptr; s = nptr;
e = nptr+l; e = nptr+l;
...@@ -463,9 +477,12 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -463,9 +477,12 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
else else
negative = 0; negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X'|| s[1]=='x')) if (base == 16 && s[0] == '0' && (s[1]=='X'|| s[1]=='x'))
s += 2; s += 2;
#endif
#if 0
if (base == 0) if (base == 0)
{ {
if (*s == '0') if (*s == '0')
...@@ -481,6 +498,7 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -481,6 +498,7 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
else else
base = 10; base = 10;
} }
#endif
save = s; save = s;
...@@ -553,8 +571,10 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs, ...@@ -553,8 +571,10 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
const char *save; const char *save;
int overflow; int overflow;
#if 0
if (base < 0 || base == 1 || base > 36) if (base < 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
s = nptr; s = nptr;
e = nptr+l; e = nptr+l;
...@@ -579,9 +599,12 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs, ...@@ -579,9 +599,12 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
else else
negative = 0; negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x')) if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
s += 2; s += 2;
#endif
#if 0
if (base == 0) if (base == 0)
{ {
if (*s == '0') if (*s == '0')
...@@ -597,6 +620,7 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs, ...@@ -597,6 +620,7 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
else else
base = 10; base = 10;
} }
#endif
save = s; save = s;
......
...@@ -2486,9 +2486,11 @@ long my_strntol_ucs2(CHARSET_INFO *cs, ...@@ -2486,9 +2486,11 @@ long my_strntol_ucs2(CHARSET_INFO *cs,
} while (1); } while (1);
bs: bs:
#if 0
if (base <= 0 || base == 1 || base > 36) if (base <= 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
overflow = 0; overflow = 0;
res = 0; res = 0;
...@@ -2597,10 +2599,12 @@ ulong my_strntoul_ucs2(CHARSET_INFO *cs, ...@@ -2597,10 +2599,12 @@ ulong my_strntoul_ucs2(CHARSET_INFO *cs,
} while (1); } while (1);
bs: bs:
#if 0
if (base <= 0 || base == 1 || base > 36) if (base <= 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
overflow = 0; overflow = 0;
res = 0; res = 0;
save = s; save = s;
...@@ -2702,10 +2706,12 @@ longlong my_strntoll_ucs2(CHARSET_INFO *cs, ...@@ -2702,10 +2706,12 @@ longlong my_strntoll_ucs2(CHARSET_INFO *cs,
} while (1); } while (1);
bs: bs:
#if 0
if (base <= 0 || base == 1 || base > 36) if (base <= 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
overflow = 0; overflow = 0;
res = 0; res = 0;
save = s; save = s;
...@@ -2816,9 +2822,11 @@ ulonglong my_strntoull_ucs2(CHARSET_INFO *cs, ...@@ -2816,9 +2822,11 @@ ulonglong my_strntoull_ucs2(CHARSET_INFO *cs,
bs: bs:
#if 0
if (base <= 0 || base == 1 || base > 36) if (base <= 0 || base == 1 || base > 36)
base = 10; base = 10;
#endif
overflow = 0; overflow = 0;
res = 0; res = 0;
save = s; save = s;
......
...@@ -4066,7 +4066,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len) ...@@ -4066,7 +4066,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
switch (state) { switch (state) {
case _CS_ID: case _CS_ID:
i->cs.number= my_strntoul(my_charset_latin1,attr,len,0,(char**)NULL,&err); i->cs.number= my_strntoul(my_charset_latin1,attr,len,10,(char**)NULL,&err);
break; break;
case _CS_COLNAME: case _CS_COLNAME:
i->cs.name=mstr(i->name,attr,len,MY_CS_NAME_SIZE-1); i->cs.name=mstr(i->name,attr,len,MY_CS_NAME_SIZE-1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment