diff options
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-big5.c | 2 | ||||
| -rw-r--r-- | strings/ctype-mb.c | 2 | ||||
| -rw-r--r-- | strings/ctype-simple.c | 4 | ||||
| -rw-r--r-- | strings/ctype-tis620.c | 6 | ||||
| -rw-r--r-- | strings/ctype-uca.c | 2 | ||||
| -rw-r--r-- | strings/ctype-ucs2.c | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 4 | ||||
| -rw-r--r-- | strings/ctype.c | 2 | ||||
| -rw-r--r-- | strings/decimal.c | 4 | ||||
| -rw-r--r-- | strings/dtoa.c | 2 | ||||
| -rw-r--r-- | strings/is_prefix.c | 2 | ||||
| -rw-r--r-- | strings/json_lib.c | 2 | ||||
| -rw-r--r-- | strings/longlong2str.c | 2 | ||||
| -rw-r--r-- | strings/my_strtoll10.c | 2 | ||||
| -rw-r--r-- | strings/my_vsnprintf.c | 2 | ||||
| -rw-r--r-- | strings/str2int.c | 2 | ||||
| -rw-r--r-- | strings/strappend.c | 2 | ||||
| -rw-r--r-- | strings/strfill.c | 2 | ||||
| -rw-r--r-- | strings/strings_def.h | 4 |
19 files changed, 25 insertions, 25 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 22cb83a8806..44f19b644fb 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -15,7 +15,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* - * This file is basicly usa7 character sets with some extra functions + * This file is basically usa7 character sets with some extra functions * for big5 handling */ diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 19caa22edb4..3fd481664fb 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -739,7 +739,7 @@ static void pad_max_char(CHARSET_INFO *cs, char *str, char *end) { if ((str + buflen) <= end) { - /* Enough space for the characer */ + /* Enough space for the character */ memcpy(str, buf, buflen); str+= buflen; } diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index d6e5f02d463..314438bcdf9 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -47,7 +47,7 @@ size_t my_strnxfrmlen_simple(CHARSET_INFO *cs, size_t len) is equal to comparing two original strings with my_strnncollsp_xxx(). Not more than 'dstlen' bytes are written into 'dst'. - To garantee that the whole string is transformed, 'dstlen' must be + To guarantee that the whole string is transformed, 'dstlen' must be at least srclen*cs->strnxfrm_multiply bytes long. Otherwise, consequent memcmp() may return a non-accurate result. @@ -1537,7 +1537,7 @@ static ulonglong d10[DIGITS_IN_ULONGLONG]= Convert a string to unsigned long long integer value with rounding. - SYNOPSYS + SYNOPSIS my_strntoull10_8bit() cs in pointer to character set str in pointer to the string to be converted diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index bfd8b0db1d5..cbf50c638fd 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -22,7 +22,7 @@ /* - This file is basicly tis620 character sets with some extra functions + This file is basically tis620 character sets with some extra functions for tis-620 handling */ @@ -502,7 +502,7 @@ static size_t thai2sortable(uchar *tstr, size_t len) string NOTE: - We can't cut strings at end \0 as this would break comparision with + We can't cut strings at end \0 as this would break comparison with LIKE characters, where the min range is stored as end \0 Arg: 2 Strings and it compare length @@ -594,7 +594,7 @@ int my_strnncollsp_tis620_nopad(CHARSET_INFO * cs __attribute__((unused)), strnxfrm replacment, convert Thai string to sortable string Arg: Destination buffer, source string, dest length and source length - Ret: Conveted string size + Ret: Converted string size */ static size_t diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index a51722b544b..2cb4652dd0f 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -35542,7 +35542,7 @@ MY_COLLATION_HANDLER my_collation_any_uca_handler = /* We consider bytes with code more than 127 as a letter. - This garantees that word boundaries work fine with regular + This guarantees that word boundaries work fine with regular expressions. Note, there is no need to mark byte 255 as a letter, it is illegal byte in UTF8. */ diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index df6572ee77d..42eeb68c871 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1065,7 +1065,7 @@ my_fill_mb2(CHARSET_INFO *cs, char *s, size_t slen, int fill) */ for (last= s + slen - buflen; s <= last; s+= buflen) { - /* Enough space for the characer */ + /* Enough space for the character */ memcpy(s, buf, buflen); } diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index a73de37bbd7..cd6ddaaa196 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -4914,7 +4914,7 @@ my_strnxfrmlen_unicode_full_bin(CHARSET_INFO *cs, size_t len) /* We consider bytes with code more than 127 as a letter. - This garantees that word boundaries work fine with regular + This guarantees that word boundaries work fine with regular expressions. Note, there is no need to mark byte 255 as a letter, it is illegal byte in UTF8. */ @@ -7305,7 +7305,7 @@ struct charset_info_st my_charset_filename= /* We consider bytes with code more than 127 as a letter. - This garantees that word boundaries work fine with regular + This guarantees that word boundaries work fine with regular expressions. Note, there is no need to mark byte 255 as a letter, it is illegal byte in UTF8. */ diff --git a/strings/ctype.c b/strings/ctype.c index 28bfbf16ff6..0412d282ca9 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -40,7 +40,7 @@ /* Avoid using my_snprintf We cannot use my_snprintf() here, because ctype.o is - used to build conf_to_src, which must require minimun + used to build conf_to_src, which must require minimum dependency. */ diff --git a/strings/decimal.c b/strings/decimal.c index 74b8d2ed8e5..c64fe189565 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -739,7 +739,7 @@ int decimal_shift(decimal_t *dec, int shift) /* If there are gaps then fill ren with 0. - Only one of following 'for' loops will work becouse beg <= end + Only one of following 'for' loops will work because beg <= end */ beg= ROUND_UP(beg + 1) - 1; end= ROUND_UP(end) - 1; @@ -863,7 +863,7 @@ internal_str2dec(const char *from, decimal_t *to, char **end, my_bool fixed) intg=intg1*DIG_PER_DEC1; } } - /* Error is guranteed to be set here */ + /* Error is guaranteed to be set here */ to->intg=intg; to->frac=frac; diff --git a/strings/dtoa.c b/strings/dtoa.c index 7b560227026..ec0d2a9143d 100644 --- a/strings/dtoa.c +++ b/strings/dtoa.c @@ -269,7 +269,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to, Assume that we don't have enough space to place all significant digits in the 'f' format. We have to choose between the 'e' format and the 'f' one to keep as many significant digits as possible. - Let E and F be the lengths of decimal representaion in the 'e' and 'f' + Let E and F be the lengths of decimal representation in the 'e' and 'f' formats, respectively. We want to use the 'f' format if, and only if F <= E. Consider the following cases: 1. decpt <= 0. diff --git a/strings/is_prefix.c b/strings/is_prefix.c index 2933577b5ab..dfb61612e79 100644 --- a/strings/is_prefix.c +++ b/strings/is_prefix.c @@ -31,7 +31,7 @@ Defines: is_prefix() is_prefix(s, t) returns 1 if s starts with t. - A empty t is allways a prefix. + A empty t is always a prefix. */ #include "strings_def.h" diff --git a/strings/json_lib.c b/strings/json_lib.c index 9b5cc2f5128..57ac3eb15b6 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -185,7 +185,7 @@ static int read_array(json_engine_t *j) /* Character classes inside the JSON string constant. We mostly need this to parse escaping properly. - Escapings availabe in JSON are: + Escapings available in JSON are: \" - quotation mark \\ - backslash \b - backspace UNICODE 8 diff --git a/strings/longlong2str.c b/strings/longlong2str.c index 4be380207a4..ab46353d5e1 100644 --- a/strings/longlong2str.c +++ b/strings/longlong2str.c @@ -47,7 +47,7 @@ Note: The standard itoa() returns a pointer to the argument, when int2str returns the pointer to the end-null. - itoa assumes that 10 -base numbers are allways signed and other arn't. + itoa assumes that 10 -base numbers are always signed and other aren't. */ #include "strings_def.h" diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c index ea556cea127..2311b4e5079 100644 --- a/strings/my_strtoll10.c +++ b/strings/my_strtoll10.c @@ -43,7 +43,7 @@ static unsigned long lfactor[9]= /* Convert a string to an to unsigned long long integer value - SYNOPSYS + SYNOPSIS my_strtoll10() nptr in pointer to the string to be converted endptr in/out pointer to the end of the string/ diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index c6d9e8530dd..087e13997f8 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -312,7 +312,7 @@ static char *process_int_arg(char *to, const char *end, size_t length, /** - Procesed positional arguments. + Processed positional arguments. @param cs string charset @param to buffer where processed string will be place diff --git a/strings/str2int.c b/strings/str2int.c index fe6cd6b793e..439a50ddef6 100644 --- a/strings/str2int.c +++ b/strings/str2int.c @@ -191,7 +191,7 @@ char *str2int(register const char *src, register int radix, long int lower, return (char*) src; } - /* Theese are so slow compared with ordinary, optimized atoi */ + /* These are so slow compared with ordinary, optimized atoi */ #ifdef WANT_OUR_ATOI diff --git a/strings/strappend.c b/strings/strappend.c index 2d04f009a60..b469e7488cb 100644 --- a/strings/strappend.c +++ b/strings/strappend.c @@ -33,7 +33,7 @@ strappend(dest, len, fill) appends fill-characters to a string so that the result length == len. If the string is longer than len it's - trunked. The des+len character is allways set to NULL. + trunked. The des+len character is always set to NULL. */ #include "strings_def.h" diff --git a/strings/strfill.c b/strings/strfill.c index 377f9b85e36..8f69b092cd1 100644 --- a/strings/strfill.c +++ b/strings/strfill.c @@ -32,7 +32,7 @@ Defines: strfill() strfill(dest, len, fill) makes a string of fill-characters. The result - string is of length == len. The des+len character is allways set to NULL. + string is of length == len. The des+len character is always set to NULL. strfill() returns pointer to dest+len; */ diff --git a/strings/strings_def.h b/strings/strings_def.h index afe737ab301..9aab99cdf72 100644 --- a/strings/strings_def.h +++ b/strings/strings_def.h @@ -18,8 +18,8 @@ /* This file is to be include first in all files in the string directory */ #undef DBUG_ASSERT_AS_PRINTF -#include <my_global.h> /* Define standar vars */ -#include "m_string.h" /* Exernal defintions of string functions */ +#include <my_global.h> /* Define standard vars */ +#include "m_string.h" /* Exernal definitions of string functions */ /* We can't use the original DBUG_ASSERT() (which includes _db_flush()) |