1 files changed, 20 insertions, 11 deletions

diff --git a/memcmove.c b/memcmove.c
index ab9e6d9..a538250 100644
--- a/memcmove.c
+++ b/memcmove.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -38,49 +38,58 @@ main(void)
 {
 	char buf[1024];
 
-	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_memcmove(&buf[5], &buf[5], 'o', 5) == &buf[5 + 5]);
 	assert(!strncmp(buf, "-----hello-", 11));
 
-	memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
-	stpcpy(&buf[5], "hello")[0] = '-';;
+	memset(buf, '-', sizeof(buf));
+	buf[sizeof(buf) - 1] = '\0';
+	stpcpy(&buf[5], "hello")[0] = '-';
 	assert(libsimple_memcmove(&buf[5], &buf[5], 'l', 5) == &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_memcmove(&buf[5], &buf[5], 'x', 5) == NULL);
 	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_memcmove(&buf[3], &buf[5], 'o', 5) == &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_memcmove(&buf[3], &buf[5], 'l', 5) == &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_memcmove(&buf[3], &buf[5], 'x', 5) == NULL);
 	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_memcmove(&buf[8], &buf[5], 'o', 5) == &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_memcmove(&buf[8], &buf[5], 'l', 5) == &buf[8 + 3]);
 	assert(!strncmp(buf, "-----helhel-", 12));
 
-	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_memcmove(&buf[8], &buf[5], 'x', 5) == NULL);
 	assert(!strncmp(buf, "-----helhello-", 14));