Replace to last static inline's with line + extern inline, and fix warnings

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 13 insertions, 7 deletions

diff --git a/rawmemcmove.c b/rawmemcmove.c
index fd831af..aeec55f 100644
--- a/rawmemcmove.c
+++ b/rawmemcmove.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -14,34 +14,40 @@ main(void)
 {
 	char buf[100];
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
 	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_rawmemcmove(&buf[5], &buf[5], 'o') == &buf[5 + 5]);
 	assert(!strncmp(buf, "-----hello-", 11));
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
 	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_rawmemcmove(&buf[5], &buf[5], 'l') == &buf[5 + 3]);
 	assert(!strncmp(buf, "-----hello-", 11));
 
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
 	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_rawmemcmove(&buf[3], &buf[5], 'o') == &buf[3 + 5]);
 	assert(!strncmp(buf, "---hellolo-", 11));
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
 	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_rawmemcmove(&buf[3], &buf[5], 'l') == &buf[3 + 3]);
 	assert(!strncmp(buf, "---helello-", 11));
 
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
 	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_rawmemcmove(&buf[8], &buf[5], 'o') == &buf[8 + 5]);
 	assert(!strncmp(buf, "-----helhello-", 14));
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
 	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_rawmemcmove(&buf[8], &buf[5], 'l') == &buf[8 + 3]);
 	assert(!strncmp(buf, "-----helhel-", 12));