rfc822: Use the memmem module

[ccan] / ccan / rfc822 / rfc822.c

diff --git a/ccan/rfc822/rfc822.c b/ccan/rfc822/rfc822.c
index 08c0541328396c10f0afa59486429602610b4c16..636d29a612c2c4b189af9f0fc50cfb7ad4957643 100644 (file)
--- a/ccan/rfc822/rfc822.c
+++ b/ccan/rfc822/rfc822.c
@@ -8,6 +8,7 @@
 #include <ccan/list/list.h>
 #include <stdio.h>
 
+#include <ccan/memmem/memmem.h>
 #include <ccan/rfc822/rfc822.h>
 
 #ifdef TAL_USE_TALLOC
@@ -16,24 +17,6 @@
 #include <ccan/tal/tal.h>
 #endif
 
-#if !HAVE_MEMMEM
-void *memmem(const void *haystack, size_t haystacklen,
-            const void *needle, size_t needlelen)
-{
-       const char *p, *last;
-
-       p = haystack;
-       last = p + haystacklen - needlelen;
-
-       do {
-               if (memcmp(p, needle, needlelen) == 0)
-                       return (void *)p;
-       } while (p++ <= last);
-
-       return NULL;
-}
-#endif
-
 static void (*allocation_failure_hook)(const char *);
 
 static void NORETURN default_allocation_failure(const char *s)