diff options
| author | Mattias Andrée <maandree@kth.se> | 2024-08-18 09:58:23 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2024-08-18 09:58:23 +0200 |
| commit | a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9 (patch) | |
| tree | d976683461a0f427d2f1ef79a8732a048dd0c67b /memmem.c | |
| parent | Merge tag '1.3' into since (diff) | |
| parent | Update VERSION_MINOR (diff) | |
| download | libsimple-a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9.tar.gz libsimple-a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9.tar.bz2 libsimple-a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9.tar.xz | |
Merge tag '1.4' into since
Version 1.4
Diffstat (limited to '')
| -rw-r--r-- | memmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,16 +1,16 @@ /* See LICENSE file for copyright and license details. */ -#include "libsimple.h" +#include "common.h" #ifndef TEST void * libsimple_memmem(const void *hay_, size_t hayn, const void *sub_, size_t subn) { - char *hay = (void *)hay_, *end; + const char *hay = hay_, *end; const char *sub = sub_; if (!subn) - return hay; + return REMOVE_CONST(hay, char *); if (hayn < subn) return NULL; if (subn == 1) @@ -18,7 +18,7 @@ libsimple_memmem(const void *hay_, size_t hayn, const void *sub_, size_t subn) for (end = &hay[hayn - subn + 1]; hay != end; hay++) if (*hay == *sub && !memcmp(hay, sub, subn)) - return hay; + return REMOVE_CONST(hay, char *); return NULL; } |