diff options
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-bin.c | 4 | ||||
| -rw-r--r-- | strings/ctype-simple.c | 4 | ||||
| -rw-r--r-- | strings/r_strinstr.c | 4 | ||||
| -rw-r--r-- | strings/strinstr.c | 4 | ||||
| -rw-r--r-- | strings/strstr.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 67435b7df6c..43575bbc277 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -294,7 +294,7 @@ uint my_instr_bin(CHARSET_INFO *cs __attribute__((unused)), end= (const uchar*) b+b_length-s_length+1; search_end= (const uchar*) s + s_length; -skipp: +skip: while (str != end) { if ( (*str++) == (*search)) @@ -306,7 +306,7 @@ skipp: while (j != search_end) if ((*i++) != (*j++)) - goto skipp; + goto skip; if (nmatch > 0) { diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 6f77d6f3e16..62eb1418970 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -1055,7 +1055,7 @@ uint my_instr_simple(CHARSET_INFO *cs, end= (const uchar*) b+b_length-s_length+1; search_end= (const uchar*) s + s_length; -skipp: +skip: while (str != end) { if (cs->sort_order[*str++] == cs->sort_order[*search]) @@ -1067,7 +1067,7 @@ skipp: while (j != search_end) if (cs->sort_order[*i++] != cs->sort_order[*j++]) - goto skipp; + goto skip; if (nmatch > 0) { diff --git a/strings/r_strinstr.c b/strings/r_strinstr.c index 76d310a3fda..fdd6e010a22 100644 --- a/strings/r_strinstr.c +++ b/strings/r_strinstr.c @@ -35,7 +35,7 @@ uint r_strinstr(reg1 my_string str,int from, reg4 my_string search) /* pointer to the last char of search */ my_string search_end = search + len - 1; - skipp: + skip: while (start >= str) /* Cant be != because the first char */ { if (*start-- == *search_end) @@ -43,7 +43,7 @@ uint r_strinstr(reg1 my_string str,int from, reg4 my_string search) i = start; j = search_end - 1; while (j >= search && start > str) if (*i-- != *j--) - goto skipp; + goto skip; return (uint) ((start - len) - str + 3); } } diff --git a/strings/strinstr.c b/strings/strinstr.c index 1c814d19d47..457581af950 100644 --- a/strings/strinstr.c +++ b/strings/strinstr.c @@ -34,14 +34,14 @@ uint strinstr(reg1 const char *str,reg4 const char *search) reg2 my_string i,j; my_string start = (my_string) str; - skipp: + skip: while (*str != '\0') { if (*str++ == *search) { i=(my_string) str; j= (my_string) search+1; while (*j) - if (*i++ != *j++) goto skipp; + if (*i++ != *j++) goto skip; return ((uint) (str - start)); } } diff --git a/strings/strstr.c b/strings/strstr.c index ca845568ddb..bd65ef654b1 100644 --- a/strings/strstr.c +++ b/strings/strstr.c @@ -37,12 +37,12 @@ char *strstr(register const char *str,const char *search) register char *i,*j; register char first= *search; -skipp: +skip: while (*str != '\0') { if (*str++ == first) { i=(char*) str; j=(char*) search+1; while (*j) - if (*i++ != *j++) goto skipp; + if (*i++ != *j++) goto skip; return ((char*) str-1); } } |