database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
strings/ctype-simple.c:
  Hide unused code
strings/ctype-utf8.c:
  Hide unused code
This commit is contained in:
unknown
2003-01-17 13:17:22 +04:00
parent 57ab67de6b
commit e6c2ca3131
3 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
strings/ctype-simple.c
View File

@ -214,8 +214,10 @@ long my_strntol_8bit(CHARSET_INFO *cs,
const char *save, *e;
int overflow;
#if 0
if (base < 0 || base == 1 || base > 36)
base = 10;
#endif
s = nptr;
e = nptr+l;
@ -241,9 +243,12 @@ long my_strntol_8bit(CHARSET_INFO *cs,
else
negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
s += 2;
#endif
#if 0
if (base == 0)
{
if (*s == '0')
@ -259,6 +264,7 @@ long my_strntol_8bit(CHARSET_INFO *cs,
else
base = 10;
}
#endif
save = s;
cutoff = ((ulong)~0L) / (unsigned long int) base;
@ -330,8 +336,10 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
const char *save, *e;
int overflow;
#if 0
if (base < 0 || base == 1 || base > 36)
base = 10;
#endif
s = nptr;
e = nptr+l;
@ -356,9 +364,12 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
else
negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
s += 2;
#endif
#if 0
if (base == 0)
{
if (*s == '0')
@ -374,6 +385,7 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
else
base = 10;
}
#endif
save = s;
cutoff = ((ulong)~0L) / (unsigned long int) base;
@ -437,8 +449,10 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
const char *save;
int overflow;
#if 0
if (base < 0 || base == 1 || base > 36)
base = 10;
#endif
s = nptr;
e = nptr+l;
@ -463,9 +477,12 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
else
negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X'|| s[1]=='x'))
s += 2;
#endif
#if 0
if (base == 0)
{
if (*s == '0')
@ -481,6 +498,7 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
else
base = 10;
}
#endif
save = s;
@ -553,8 +571,10 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
const char *save;
int overflow;
#if 0
if (base < 0 || base == 1 || base > 36)
base = 10;
#endif
s = nptr;
e = nptr+l;
@ -579,9 +599,12 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
else
negative = 0;
#if 0
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
s += 2;
#endif
#if 0
if (base == 0)
{
if (*s == '0')
@ -597,6 +620,7 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
else
base = 10;
}
#endif
save = s;

8
strings/ctype-utf8.c
View File

@ -2487,8 +2487,10 @@ long my_strntol_ucs2(CHARSET_INFO *cs,
bs:
#if 0
if (base <= 0 || base == 1 || base > 36)
base = 10;
#endif
overflow = 0;
res = 0;
@ -2598,8 +2600,10 @@ ulong my_strntoul_ucs2(CHARSET_INFO *cs,
bs:
#if 0
if (base <= 0 || base == 1 || base > 36)
base = 10;
#endif
overflow = 0;
res = 0;
@ -2703,8 +2707,10 @@ longlong my_strntoll_ucs2(CHARSET_INFO *cs,
bs:
#if 0
if (base <= 0 || base == 1 || base > 36)
base = 10;
#endif
overflow = 0;
res = 0;
@ -2816,8 +2822,10 @@ ulonglong my_strntoull_ucs2(CHARSET_INFO *cs,
bs:
#if 0
if (base <= 0 || base == 1 || base > 36)
base = 10;
#endif
overflow = 0;
res = 0;

2
strings/ctype.c
View File

@ -4066,7 +4066,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
switch (state) {
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;
case _CS_COLNAME:
i->cs.name=mstr(i->name,attr,len,MY_CS_NAME_SIZE-1);