X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmemmem.c;h=06b2dfed7e61abebeeb83b5e264eb4b0b982d56f;hb=e55e4a839e8bb240b507217fdf04c85879d98300;hp=186d840096aed7badf232e6b24e7e85ca0b1eba2;hpb=c358da1eb79a1af4d7e4b887ca3896fb7f3fdcdb;p=pspp diff --git a/lib/memmem.c b/lib/memmem.c index 186d840096..06b2dfed7e 100644 --- a/lib/memmem.c +++ b/lib/memmem.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004,2007,2008 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -38,7 +38,7 @@ HAYSTACK. */ void * memmem (const void *haystack_start, size_t haystack_len, - const void *needle_start, size_t needle_len) + const void *needle_start, size_t needle_len) { /* Abstract memory is considered to be an array of 'unsigned char' values, not an array of 'char' values. See ISO C 99 section 6.2.6.1. */ @@ -63,10 +63,10 @@ memmem (const void *haystack_start, size_t haystack_len, { haystack = memchr (haystack, *needle, haystack_len); if (!haystack || __builtin_expect (needle_len == 1, 0)) - return (void *) haystack; + return (void *) haystack; haystack_len -= haystack - (const unsigned char *) haystack_start; if (haystack_len < needle_len) - return NULL; + return NULL; return two_way_short_needle (haystack, haystack_len, needle, needle_len); } else