diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2020-05-31 18:29:03 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2020-05-31 18:29:03 -0400 |
| commit | 6cc104634ef64be3be88c1fccbe98208d95d8a1a (patch) | |
| tree | 9001e5333e808808125978a52669a8bff3639438 /src/c/memmem.c | |
| parent | 82fde07cef0e41b700b9a30137562eb05f2f2c6d (diff) | |
| parent | c2f1e1096f602b1cbd4531352f3e1ea6d656a186 (diff) | |
Merge branch 'dfsg_clean'
Diffstat (limited to 'src/c/memmem.c')
| -rw-r--r-- | src/c/memmem.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/c/memmem.c b/src/c/memmem.c index f31f4e31..efddd0c1 100644 --- a/src/c/memmem.c +++ b/src/c/memmem.c @@ -1,4 +1,6 @@ -#include "config.h" +#include "memmem.h" + +#ifndef HAVE_MEMMEM /* $NetBSD$ */ @@ -38,8 +40,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -// Function renamed by Adam Chlipala in 2016. - #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD$"); @@ -54,13 +54,8 @@ __RCSID("$NetBSD$"); #define NULL ((char *)0) #endif -/* - * urweb_memmem() returns the location of the first occurence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. - */ void * -urweb_memmem(const void *b1, size_t len1, const void *b2, size_t len2) +memmem(const void *b1, size_t len1, const void *b2, size_t len2) { /* Sanity check */ if(!(b1 != NULL && b2 != NULL && len1 != 0 && len2 != 0)) @@ -85,3 +80,5 @@ urweb_memmem(const void *b1, size_t len1, const void *b2, size_t len2) return NULL; } + +#endif // !defined(HAVE_MEMMEM) |