diff options
Diffstat (limited to 'sysdeps/generic/memmem.c')
| -rw-r--r-- | sysdeps/generic/memmem.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/sysdeps/generic/memmem.c b/sysdeps/generic/memmem.c index 099897ab80..e891e26b4e 100644 --- a/sysdeps/generic/memmem.c +++ b/sysdeps/generic/memmem.c @@ -1,48 +1,48 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 92, 93, 94, 96, 97 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <stddef.h> #include <string.h> /* Return the first occurrence of NEEDLE in HAYSTACK. */ -PTR -DEFUN(memmem, (haystack, haystack_len, - needle, needle_len), - CONST PTRCONST haystack AND CONST size_t haystack_len AND - CONST PTRCONST needle AND CONST size_t needle_len) +void * +memmem (haystack, haystack_len, needle, needle_len) + const void *haystack; + size_t haystack_len; + const void *needle; + size_t needle_len; { - register CONST char *begin; - register CONST char *CONST last_possible - = (CONST char *) haystack + haystack_len - needle_len; + const char *begin; + const char *const last_possible + = (const char *) haystack + haystack_len - needle_len; if (needle_len == 0) /* The first occurrence of the empty string is deemed to occur at the end of the string. */ - return (PTR) &((CONST char *) haystack)[haystack_len - 1]; + return (void *) &((const char *) haystack)[haystack_len - 1]; - for (begin = (CONST char *) haystack; begin <= last_possible; ++begin) - if (begin[0] == ((CONST char *) needle)[0] && - !memcmp ((CONST PTR) &begin[1], - (CONST PTR) ((CONST char *) needle + 1), + for (begin = (const char *) haystack; begin <= last_possible; ++begin) + if (begin[0] == ((const char *) needle)[0] && + !memcmp ((const void *) &begin[1], + (const void *) ((const char *) needle + 1), needle_len - 1)) - return (PTR) begin; + return (void *) begin; return NULL; } |