aboutsummaryrefslogtreecommitdiffstats
path: root/memrmem.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-06-11 16:37:09 +0200
committerMattias Andrée <maandree@kth.se>2022-06-11 16:37:09 +0200
commitfcfe59c1f2219408ac2a9cd84b386816ff252221 (patch)
tree0f46c009babfba2d0200ece3ecce067c548a66b6 /memrmem.c
parentRemove `static` from some `static inline` (diff)
downloadlibsimple-fcfe59c1f2219408ac2a9cd84b386816ff252221.tar.gz
libsimple-fcfe59c1f2219408ac2a9cd84b386816ff252221.tar.bz2
libsimple-fcfe59c1f2219408ac2a9cd84b386816ff252221.tar.xz
Fix warnings, replace some static inline with inline + extern inline, and fix glibc support
Diffstat (limited to '')
-rw-r--r--memrmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/memrmem.c b/memrmem.c
index 3968e73..68352c2 100644
--- a/memrmem.c
+++ b/memrmem.c
@@ -6,11 +6,11 @@
void *
libsimple_memrmem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
{
- char *hay = (void *)hay_, *start;
+ const char *hay = hay_, *start;
const char *sub = sub_;
if (!subn)
- return &hay[hayn];
+ return &REMOVE_CONST(hay, char *)[hayn];
if (hayn < subn)
return NULL;
if (subn == 1)
@@ -20,7 +20,7 @@ libsimple_memrmem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
hay = &hay[hayn - subn];
do {
if (*hay == *sub && !memcmp(hay, sub, subn))
- return hay;
+ return REMOVE_CONST(hay, char *);
} while (hay-- != start);
return NULL;