diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/_strerror.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/memrchr.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/strcasestr.c | 20 | ||||
| -rw-r--r-- | sysdeps/generic/strstr.c | 6 |
4 files changed, 17 insertions, 13 deletions
diff --git a/sysdeps/generic/_strerror.c b/sysdeps/generic/_strerror.c index ae520f32fc..123331ac05 100644 --- a/sysdeps/generic/_strerror.c +++ b/sysdeps/generic/_strerror.c @@ -56,7 +56,7 @@ __strerror_r (int errnum, char *buf, size_t buflen) buffer size. */ q = __mempcpy (buf, unk, MIN (unklen, buflen)); if (unklen < buflen) - memcpy (q, p, MIN (&numbuf[21] - p, buflen - unklen)); + memcpy (q, p, MIN ((size_t) (&numbuf[21] - p), buflen - unklen)); /* Terminate the string in any case. */ if (buflen > 0) diff --git a/sysdeps/generic/memrchr.c b/sysdeps/generic/memrchr.c index 6fa918d26e..d1c06e041a 100644 --- a/sysdeps/generic/memrchr.c +++ b/sysdeps/generic/memrchr.c @@ -86,7 +86,7 @@ __memrchr (s, c_in, n) /* All these elucidatory comments refer to 4-byte longwords, but the theory applies equally well to 8-byte longwords. */ - longword_ptr = (unsigned long int *) char_ptr; + longword_ptr = (const unsigned long int *) char_ptr; /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits the "holes." Note that there is a hole just to the left of diff --git a/sysdeps/generic/strcasestr.c b/sysdeps/generic/strcasestr.c index 794b50beff..5fe1b10934 100644 --- a/sysdeps/generic/strcasestr.c +++ b/sysdeps/generic/strcasestr.c @@ -1,5 +1,5 @@ /* Return the offset of one string within another. - Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1994,1996,1997,1998,1999,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,7 +62,7 @@ __strcasestr (phaystack, pneedle) if (c == '\0') goto ret0; } - while (_tolower (c) != b); + while (_tolower (c) != (int) b); c = _tolower (*++needle); if (c == '\0') @@ -80,40 +80,42 @@ __strcasestr (phaystack, pneedle) a = *++haystack; if (a == '\0') goto ret0; - if (_tolower (a) == b) + if (_tolower (a) == (int) b) break; a = *++haystack; if (a == '\0') goto ret0; -shloop: } - while (_tolower (a) != b); +shloop: + ; + } + while (_tolower (a) != (int) b); jin: a = *++haystack; if (a == '\0') goto ret0; - if (_tolower (a) != c) + if (_tolower (a) != (int) c) goto shloop; rhaystack = haystack-- + 1; rneedle = needle; a = _tolower (*rneedle); - if (_tolower (*rhaystack) == a) + if (_tolower (*rhaystack) == (int) a) do { if (a == '\0') goto foundneedle; ++rhaystack; a = _tolower (*++needle); - if (_tolower (*rhaystack) != a) + if (_tolower (*rhaystack) != (int) a) break; if (a == '\0') goto foundneedle; ++rhaystack; a = _tolower (*++needle); } - while (_tolower (*rhaystack) == a); + while (_tolower (*rhaystack) == (int) a); needle = rneedle; /* took the register-poor approach */ diff --git a/sysdeps/generic/strstr.c b/sysdeps/generic/strstr.c index 03d6c8e5fc..6bf92e7473 100644 --- a/sysdeps/generic/strstr.c +++ b/sysdeps/generic/strstr.c @@ -1,5 +1,5 @@ /* Return the offset of one string within another. - Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -82,7 +82,9 @@ strstr (phaystack, pneedle) a = *++haystack; if (a == '\0') goto ret0; -shloop: } +shloop: + ; + } while (a != b); jin: a = *++haystack; |