From 87d5824b904c5f015f6988d11b04dafda355f9af Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Sat, 15 Aug 2020 15:43:57 -0400 Subject: adjust to compile with c89 --- src/string/memccpy.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/string/memccpy.c b/src/string/memccpy.c index a6aa6372..b3af75ff 100644 --- a/src/string/memccpy.c +++ b/src/string/memccpy.c @@ -2,16 +2,19 @@ void *memccpy(void * restrict s1, const void * restrict s2, int c, size_t n) { - //__ASSERT_NOOVERLAP(s1, s2, n); - unsigned char *dst = s1; const unsigned char *src = s2; - for (size_t i = 0; i < n; i++) { + size_t i = 0; + + ASSERT_NOOVERLAP(s1, s2, n); + + for (i = 0; i < n; i++) { dst[i] = src[i]; if (dst[i] == (unsigned char)c) { return dst + i + 1; } } + return NULL; } -- cgit v1.2.1