From 1d1df6d11f9a621dc37b0432682a9825469ba3d7 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 9 Nov 2022 11:43:09 +0300 Subject: [PATCH] memmem exists both on GNU and FreeBSD already --- dht-bootstrap.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/dht-bootstrap.c b/dht-bootstrap.c index a4fe67e..2e6e77d 100644 --- a/dht-bootstrap.c +++ b/dht-bootstrap.c @@ -20,9 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* For memmem. */ -#define _GNU_SOURCE - #include #include #include @@ -38,35 +35,10 @@ THE SOFTWARE. #include #include -#ifndef HAVE_MEMMEM -#ifdef __GLIBC__ -#define HAVE_MEMMEM -#endif -#endif - #ifndef MSG_CONFIRM #define MSG_CONFIRM 0 #endif -/* We set sin_family to 0 to mark unused slots. */ -#if AF_INET == 0 || AF_INET6 == 0 -#error You lose -#endif - -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -/* nothing */ -#elif defined(__GNUC__) -#define inline __inline -#if (__GNUC__ >= 3) -#define restrict __restrict -#else -#define restrict /**/ -#endif -#else -#define inline /**/ -#define restrict /**/ -#endif - #define MAX(x, y) ((x) >= (y) ? (x) : (y)) #define MIN(x, y) ((x) <= (y) ? (x) : (y)) @@ -1067,26 +1039,6 @@ fail: #undef COPY #undef ADD_V -#ifndef HAVE_MEMMEM -static void * -memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen) -{ - const char *h = haystack; - const char *n = needle; - size_t i; - - /* size_t is unsigned */ - if (needlelen > haystacklen) - return NULL; - - for (i = 0; i <= haystacklen - needlelen; i++) { - if (memcmp(h + i, n, needlelen) == 0) - return (void *)(h + i); - } - return NULL; -} -#endif - static int parse_message( const unsigned char *buf, -- 2.44.0