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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e6c1e588
Commit
e6c1e588
authored
Jul 23, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gen_lex_hash: Omit deprecated register keywords
This is follow-up to
d36c107a
parent
a5e268a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
sql/gen_lex_hash.cc
sql/gen_lex_hash.cc
+14
-14
No files found.
sql/gen_lex_hash.cc
View file @
e6c1e588
...
...
@@ -403,8 +403,8 @@ int main(int argc,char **argv)
static SYMBOL *get_hash_symbol(const char *s,
\n
\
unsigned int len,bool function)
\n
\
{
\n
\
register
uchar *hash_map;
\n
\
register
const char *cur_str= s;
\n
\
uchar *hash_map;
\n
\
const char *cur_str= s;
\n
\
\n
\
if (len == 0) {
\n
\
DBUG_PRINT(
\"
warning
\"
, (
\"
get_hash_symbol() received a request for a zero-length symbol, which is probably a mistake.
\"
));\
...
...
@@ -416,25 +416,25 @@ static SYMBOL *get_hash_symbol(const char *s,\n\
if (function){
\n
\
if (len>sql_functions_max_len) return 0;
\n
\
hash_map= sql_functions_map;
\n
\
register
uint32 cur_struct= uint4korr(hash_map+((len-1)*4));
\n
\
uint32 cur_struct= uint4korr(hash_map+((len-1)*4));
\n
\
\n
\
for (;;){
\n
\
register
uchar first_char= (uchar)cur_struct;
\n
\
uchar first_char= (uchar)cur_struct;
\n
\
\n
\
if (first_char == 0)
\n
\
{
\n
\
register
int16 ires= (int16)(cur_struct>>16);
\n
\
int16 ires= (int16)(cur_struct>>16);
\n
\
if (ires==array_elements(symbols)) return 0;
\n
\
register
SYMBOL *res;
\n
\
SYMBOL *res;
\n
\
if (ires>=0)
\n
\
res= symbols+ires;
\n
\
else
\n
\
res= sql_functions-ires-1;
\n
\
register
uint count= (uint) (cur_str - s);
\n
\
uint count= (uint) (cur_str - s);
\n
\
return lex_casecmp(cur_str,res->name+count,len-count) ? 0 : res;
\n
\
}
\n
\
\n
\
register
uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];
\n
\
uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];
\n
\
if (cur_char<first_char) return 0;
\n
\
cur_struct>>=8;
\n
\
if (cur_char>(uchar)cur_struct) return 0;
\n
\
...
...
@@ -450,20 +450,20 @@ static SYMBOL *get_hash_symbol(const char *s,\n\
}else{
\n
\
if (len>symbols_max_len) return 0;
\n
\
hash_map= symbols_map;
\n
\
register
uint32 cur_struct= uint4korr(hash_map+((len-1)*4));
\n
\
uint32 cur_struct= uint4korr(hash_map+((len-1)*4));
\n
\
\n
\
for (;;){
\n
\
register
uchar first_char= (uchar)cur_struct;
\n
\
uchar first_char= (uchar)cur_struct;
\n
\
\n
\
if (first_char==0){
\n
\
register
int16 ires= (int16)(cur_struct>>16);
\n
\
int16 ires= (int16)(cur_struct>>16);
\n
\
if (ires==array_elements(symbols)) return 0;
\n
\
register
SYMBOL *res= symbols+ires;
\n
\
register
uint count= (uint) (cur_str - s);
\n
\
SYMBOL *res= symbols+ires;
\n
\
uint count= (uint) (cur_str - s);
\n
\
return lex_casecmp(cur_str,res->name+count,len-count)!=0 ? 0 : res;
\n
\
}
\n
\
\n
\
register
uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];
\n
\
uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];
\n
\
if (cur_char<first_char) return 0;
\n
\
cur_struct>>=8;
\n
\
if (cur_char>(uchar)cur_struct) return 0;
\n
\
...
...
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