X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrcasestr.c;h=e8ce38c5fdeca204f0cac63cb82e9b1041f2f453;hb=25b6b5120113989e0b91de9d0b75d3d625bbc753;hp=fe970ae84eb1a2fa8c5a026db8e50c2d1f2d389a;hpb=9c063a2afdc2f2f6a1da2bb2ec54eadbae42a0ab;p=gnulib.git diff --git a/lib/strcasestr.c b/lib/strcasestr.c index fe970ae84..e8ce38c5f 100644 --- a/lib/strcasestr.c +++ b/lib/strcasestr.c @@ -1,5 +1,5 @@ /* Case-insensitive searching in a string. - Copyright (C) 2005-2008 Free Software Foundation, Inc. + Copyright (C) 2005-2012 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software; you can redistribute it and/or modify @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #include @@ -29,11 +28,11 @@ /* Two-Way algorithm. */ #define RETURN_TYPE char * -#define AVAILABLE(h, h_l, j, n_l) \ - (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \ +#define AVAILABLE(h, h_l, j, n_l) \ + (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \ && ((h_l) = (j) + (n_l))) #define CANON_ELEMENT(c) TOLOWER (c) -#define CMP_FUNC(p1, p2, l) \ +#define CMP_FUNC(p1, p2, l) \ strncasecmp ((const char *) (p1), (const char *) (p2), l) #include "str-two-way.h" @@ -55,7 +54,7 @@ strcasestr (const char *haystack_start, const char *needle_start) while (*haystack && *needle) { ok &= (TOLOWER ((unsigned char) *haystack) - == TOLOWER ((unsigned char) *needle)); + == TOLOWER ((unsigned char) *needle)); haystack++; needle++; } @@ -72,12 +71,12 @@ strcasestr (const char *haystack_start, const char *needle_start) ISO C 99 section 6.2.6.1. */ if (needle_len < LONG_NEEDLE_THRESHOLD) return two_way_short_needle ((const unsigned char *) haystack, - haystack_len, - (const unsigned char *) needle_start, - needle_len); + haystack_len, + (const unsigned char *) needle_start, + needle_len); return two_way_long_needle ((const unsigned char *) haystack, haystack_len, - (const unsigned char *) needle_start, - needle_len); + (const unsigned char *) needle_start, + needle_len); } #undef LONG_NEEDLE_THRESHOLD