Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
2d332844
Commit
2d332844
authored
Jan 17, 2003
by
venu@myvenu.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
parents
51eb44c9
72fcf5e4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
10 deletions
+46
-10
strings/ctype-simple.c
strings/ctype-simple.c
+27
-3
strings/ctype-utf8.c
strings/ctype-utf8.c
+18
-6
strings/ctype.c
strings/ctype.c
+1
-1
No files found.
strings/ctype-simple.c
View file @
2d332844
...
@@ -214,8 +214,10 @@ long my_strntol_8bit(CHARSET_INFO *cs,
...
@@ -214,8 +214,10 @@ long my_strntol_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
;
...
@@ -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,8 +336,10 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
...
@@ -330,8 +336,10 @@ 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
;
...
...
strings/ctype-utf8.c
View file @
2d332844
...
@@ -23,6 +23,10 @@
...
@@ -23,6 +23,10 @@
#include "m_ctype.h"
#include "m_ctype.h"
#include <errno.h>
#include <errno.h>
#ifndef EILSEQ
#define EILSEQ ENOENT
#endif
#ifdef HAVE_CHARSET_utf8
#ifdef HAVE_CHARSET_utf8
#define HAVE_UNIDATA
#define HAVE_UNIDATA
#endif
#endif
...
@@ -2483,8 +2487,10 @@ long my_strntol_ucs2(CHARSET_INFO *cs,
...
@@ -2483,8 +2487,10 @@ long my_strntol_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
;
...
@@ -2594,8 +2600,10 @@ ulong my_strntoul_ucs2(CHARSET_INFO *cs,
...
@@ -2594,8 +2600,10 @@ ulong my_strntoul_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
;
...
@@ -2699,8 +2707,10 @@ longlong my_strntoll_ucs2(CHARSET_INFO *cs,
...
@@ -2699,8 +2707,10 @@ longlong my_strntoll_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
;
...
@@ -2812,8 +2822,10 @@ ulonglong my_strntoull_ucs2(CHARSET_INFO *cs,
...
@@ -2812,8 +2822,10 @@ 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
;
...
...
strings/ctype.c
View file @
2d332844
...
@@ -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
,
1
0
,(
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment