diff options
author | Ulrich Drepper <drepper@redhat.com> | 1999-01-23 22:17:17 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1999-01-23 22:17:17 +0000 |
commit | 4caef86ca68a3fea8fab5398bedc5e0e6c0d222b (patch) | |
tree | 4ed5e6e23fb6d99df8761dc425adbb91405915fb /sysdeps/generic/strcasestr.c | |
parent | 8831788577cda2e19e27e6f1a793339abb9711fa (diff) | |
download | glibc-4caef86ca68a3fea8fab5398bedc5e0e6c0d222b.tar.gz glibc-4caef86ca68a3fea8fab5398bedc5e0e6c0d222b.tar.xz glibc-4caef86ca68a3fea8fab5398bedc5e0e6c0d222b.zip |
Update.
1999-01-23 Ulrich Drepper <drepper@cygnus.com> * nss/nss_files/files-XXX.c (internal_getent): Make sure the buffer has at least two bytes (not one). Correct buflen parameter type. * nss/nss_files/files-alias.c (get_next_alias): Make sure buffer has at least two bytes. Use fgets_unlocked instead of fgets. * ctype/ctype.h: Don't user __tolower directly for tolower implementation. Use inline function which tests for the range first. Make _tolower equivalent to old tolower macros. Likewise for toupper. * ctype/ctype.c: Change tolower/toupper definition accordingly. * argp/argp-help.c: Use _tolower instead of tolower if possible. * inet/ether_aton_r.c: Likewise. * inet/ether_line.c: Likewise. * inet/rcmd.c: Likewise. * intl/l10nflist.c: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/linereader.c: Likewise. * locale/programs/localedef.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * posix/regex.c: Likewise. * resolv/inet_net_pton.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfscanf.c: Likewise. * sysdeps/generic/strcasestr.c: Likewise. * math/bits/mathcalls.h: Fix typo.
Diffstat (limited to 'sysdeps/generic/strcasestr.c')
-rw-r--r-- | sysdeps/generic/strcasestr.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sysdeps/generic/strcasestr.c b/sysdeps/generic/strcasestr.c index a5786fac58..794b50beff 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 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998, 1999 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 @@ -52,7 +52,7 @@ __strcasestr (phaystack, pneedle) haystack = (const unsigned char *) phaystack; needle = (const unsigned char *) pneedle; - b = tolower (*needle); + b = _tolower (*needle); if (b != '\0') { haystack--; /* possible ANSI violation */ @@ -62,9 +62,9 @@ __strcasestr (phaystack, pneedle) if (c == '\0') goto ret0; } - while (tolower (c) != b); + while (_tolower (c) != b); - c = tolower (*++needle); + c = _tolower (*++needle); if (c == '\0') goto foundneedle; ++needle; @@ -80,40 +80,40 @@ __strcasestr (phaystack, pneedle) a = *++haystack; if (a == '\0') goto ret0; - if (tolower (a) == b) + if (_tolower (a) == b) break; a = *++haystack; if (a == '\0') goto ret0; shloop: } - while (tolower (a) != b); + while (_tolower (a) != b); jin: a = *++haystack; if (a == '\0') goto ret0; - if (tolower (a) != c) + if (_tolower (a) != c) goto shloop; rhaystack = haystack-- + 1; rneedle = needle; - a = tolower (*rneedle); + a = _tolower (*rneedle); - if (tolower (*rhaystack) == a) + if (_tolower (*rhaystack) == a) do { if (a == '\0') goto foundneedle; ++rhaystack; - a = tolower (*++needle); - if (tolower (*rhaystack) != a) + a = _tolower (*++needle); + if (_tolower (*rhaystack) != a) break; if (a == '\0') goto foundneedle; ++rhaystack; - a = tolower (*++needle); + a = _tolower (*++needle); } - while (tolower (*rhaystack) == a); + while (_tolower (*rhaystack) == a); needle = rneedle; /* took the register-poor approach */ |