diff options
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 42e700b27aa..7f26a0febda 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -521,7 +521,7 @@ int String::strstr(const String &s,uint32 offset) register const char *search=s.ptr(); const char *end=Ptr+str_length-s.length()+1; const char *search_end=s.ptr()+s.length(); -skipp: +skip: while (str != end) { if (*str++ == *search) @@ -529,7 +529,7 @@ skipp: register char *i,*j; i=(char*) str; j=(char*) search+1; while (j != search_end) - if (*i++ != *j++) goto skipp; + if (*i++ != *j++) goto skip; return (int) (str-Ptr) -1; } } @@ -553,7 +553,7 @@ int String::strstr_case(const String &s,uint32 offset) register const char *search=s.ptr(); const char *end=Ptr+str_length-s.length()+1; const char *search_end=s.ptr()+s.length(); -skipp: +skip: while (str != end) { if (str_charset->sort_order[*str++] == str_charset->sort_order[*search]) @@ -563,7 +563,7 @@ skipp: while (j != search_end) if (str_charset->sort_order[*i++] != str_charset->sort_order[*j++]) - goto skipp; + goto skip; return (int) (str-Ptr) -1; } } @@ -586,7 +586,7 @@ int String::strrstr(const String &s,uint32 offset) const char *end=Ptr+s.length()-2; const char *search_end=s.ptr()-1; -skipp: +skip: while (str != end) { if (*str-- == *search) @@ -594,7 +594,7 @@ skipp: register char *i,*j; i=(char*) str; j=(char*) search-1; while (j != search_end) - if (*i-- != *j--) goto skipp; + if (*i-- != *j--) goto skip; return (int) (i-Ptr) +1; } } |