diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-26 09:44:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-26 09:44:30 +0000 |
| commit | c3301189bde66bceb3e949e4938b167fc847dd86 (patch) | |
| tree | 2e449aae3fb42846f0338645ed73ef6311341902 /sysdeps/generic/strcasestr.c | |
| parent | 8b6e67674da3b9db3208b914bd8d892abb62ec48 (diff) | |
| download | glibc-c3301189bde66bceb3e949e4938b167fc847dd86.tar.gz glibc-c3301189bde66bceb3e949e4938b167fc847dd86.tar.xz glibc-c3301189bde66bceb3e949e4938b167fc847dd86.zip | |
Update.
2000-11-26 Ulrich Drepper <drepper@redhat.com> * inet/getnameinfo.c: Adjust casts to avoid warnings. * inet/rcmd.c: Likewise. * inet/ruserpass.c: Likewise. * inet/netinet/in.h (IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_LOOPBACK, IN6_IS_ADDR_MULTICAST, IN6_IS_ADDR_LINKLOCAL, IN6_IS_ADDR_SITELOCAL, IN6_IS_ADDR_V4MAPPED, IN6_IS_ADDR_V4COMPAT, IN6_ARE_ADDR_EQUAL, IN6_IS_ADDR_MC_NODELOCAL, IN6_IS_ADDR_MC_LINKLOCAL, IN6_IS_ADDR_MC_SITELOCAL, IN6_IS_ADDR_MC_ORGLOCAL, IN6_IS_ADDR_MC_GLOBAL): Preserve const in cast. * include/aliases.h: Add prototypes for internal __getalias* functions. * include/netdb.h: Add prototypes for __old_gethostent_r, __old_gethostbyaddr_r, __old_gethostbyname_r, __old_gethostbyname2_r, __old_getnetent_r, __old_getnetbyaddr_r, __old_getnetbyname_r, __old_getservent_r, __old_getservbyname_r, __old_getservbyport_r, __old_getprotoent_r, __old_getprotobyname_r, __old_getprotobynumber_r. * include/rpc/netdb.h: Add prototypes for __old_getrpcbyname_r, __old_getrpcbynumber_r, __old_getrpcent_r. * include/rpc/netdb.h: Add __getrpcbyname_r, __getrpcbynumber_r, __getrpcent_r prototypes.
Diffstat (limited to 'sysdeps/generic/strcasestr.c')
| -rw-r--r-- | sysdeps/generic/strcasestr.c | 20 |
1 files changed, 11 insertions, 9 deletions
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 */ |