From 57a0bd85416ede86191dd2aed1b18e3899eb7323 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sat, 16 Feb 2019 10:02:38 +0000 Subject: Correct memcpy typedef This should silence some warnings about lwc__lcase_memcpy not having the same signature as the libc memcpy. Interestingly I learned that memcpy returns a value. Signed-off-by: Daniel Silverstone --- src/libwapcaplet.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/libwapcaplet.c b/src/libwapcaplet.c index 3ef0003..9bc1fc9 100644 --- a/src/libwapcaplet.c +++ b/src/libwapcaplet.c @@ -47,7 +47,7 @@ static lwc_context *ctx = NULL; typedef lwc_hash (*lwc_hasher)(const char *, size_t); typedef int (*lwc_strncmp)(const char *, const char *, size_t); -typedef void (*lwc_memcpy)(char * restrict, const char * restrict, size_t); +typedef void * (*lwc_memcpy)(void * restrict, const void * restrict, size_t); static lwc_error lwc__initialise(void) @@ -238,12 +238,17 @@ lwc__lcase_strncmp(const char *s1, const char *s2, size_t n) return 0; } -static void -lwc__lcase_memcpy(char *restrict target, const char *restrict source, size_t n) +static void * +lwc__lcase_memcpy(void *restrict _target, const void *restrict _source, size_t n) { + char *restrict target = _target; + const char *restrict source = _source; + while (n--) { *target++ = lwc__dolower(*source++); } + + return _target; } lwc_error -- cgit v1.2.3