dht: remove custom memmem

This commit is contained in:
Adrien Beraud authored and Adrien Béraud committed 2015-09-01 17:42:07 +02:00
1 parent 2e38a307f9
commit 0ea48ed1de
2 files changed
-33

No files matched your search

-3
View File
@@ -895,9 +895,6 @@ private:
bool rateLimit();
bool neighbourhoodMaintenance(RoutingTable&);
static void *dht_memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen);
};
}
-30
View File
@@ -3226,34 +3226,4 @@ Dht::ParsedMessage::msgpack_unpack(msgpack::object msg)
throw msgpack::type_error();
}
#ifdef HAVE_MEMMEM
void *
Dht::dht_memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen)
{
return memmem(haystack, haystacklen, needle, needlelen);
}
#else
void *
Dht::dht_memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen)
{
const char *h = (const char *)haystack;
const char *n = (const char *)needle;
size_t i;
/* size_t is unsigned */
if (needlelen > haystacklen)
return nullptr;
for (i = 0; i <= haystacklen - needlelen; i++) {
if (memcmp(h + i, n, needlelen) == 0)
return (void*)(h + i);
}
return nullptr;
}
#endif
}