X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fc-strcasestr.c;h=86908d64573ac05d4722addb2b00ba16e14c7992;hb=6f730e7ae5225bf9eb36554d94805b97a72784bd;hp=0185ba950351cee0e55fefc9ea18fda1c1f3afbe;hpb=174af8a731d5ae17339dd5b69c0de0b7f24be594;p=gnulib.git diff --git a/lib/c-strcasestr.c b/lib/c-strcasestr.c index 0185ba950..86908d645 100644 --- a/lib/c-strcasestr.c +++ b/lib/c-strcasestr.c @@ -1,5 +1,5 @@ /* c-strcasestr.c -- case insensitive substring search in C locale - Copyright (C) 2005-2008 Free Software Foundation, Inc. + Copyright (C) 2005-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software: you can redistribute it and/or modify @@ -28,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 -#define CMP_FUNC(p1, p2, l) \ +#define CMP_FUNC(p1, p2, l) \ c_strncasecmp ((const char *) (p1), (const char *) (p2), l) #include "str-two-way.h" @@ -52,7 +52,7 @@ c_strcasestr (const char *haystack_start, const char *needle_start) NEEDLE if HAYSTACK is too short). */ while (*haystack && *needle) ok &= (c_tolower ((unsigned char) *haystack++) - == c_tolower ((unsigned char) *needle++)); + == c_tolower ((unsigned char) *needle++)); if (*needle) return NULL; if (ok) @@ -66,12 +66,12 @@ c_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