Libc is now written in C++

libc/string/memcmp.c

@@ -1,17 +0,0 @@
-#include <string.h>
-
-int memcmp(const void* s1, const void* s2, size_t n)
-{
-	const unsigned char* a = s1;
-	const unsigned char* b = s2;
-
-	while (n--)
-	{
-		if (*a != *b)
-			return *a - *b;
-		a++;
-		b++;
-	}
-
-	return 0;
-}

libc/string/memcmp.cpp

@@ -0,0 +1,13 @@
+#include <string.h>
+
+int memcmp(const void* s1, const void* s2, size_t n)
+{
+	const unsigned char* a = static_cast<const unsigned char*>(s1);
+	const unsigned char* b = static_cast<const unsigned char*>(s2);
+
+	for (size_t i = 0; i < n; i++)
+		if (a[i] != b[i])
+			return a[i] - b[i];
+
+	return 0;
+}

libc/string/memcpy.c

@@ -1,10 +0,0 @@
-#include <string.h>
-
-void* memcpy(void* restrict destp, const void* restrict srcp, size_t n)
-{
-	unsigned char* dest = (unsigned char*)destp;
-	const unsigned char* src = (const unsigned char*)srcp;
-	for (size_t i = 0; i < n; i++)
-		dest[i] = src[i];
-	return destp;
-}

libc/string/memcpy.cpp

@@ -0,0 +1,10 @@
+#include <string.h>
+
+void* memcpy(void* __restrict dstp, const void* __restrict srcp, size_t n)
+{
+	unsigned char* dst = static_cast<unsigned char*>(dstp);
+	const unsigned char* src = static_cast<const unsigned char*>(srcp);
+	for (size_t i = 0; i < n; i++)
+		dst[i] = src[i];
+	return dstp;
+}

libc/string/memmove.cpp

@@ -2,8 +2,8 @@
 
 void* memmove(void* destp, const void* srcp, size_t n)
 {
-	unsigned char* dest = (unsigned char*)destp;
-	const unsigned char* src = (const unsigned char*)srcp;
+	unsigned char* dest = static_cast<unsigned char*>(destp);
+	const unsigned char* src = static_cast<const unsigned char*>(srcp);
 
 	if (dest < src)
 	{

libc/string/memset.cpp

@@ -2,7 +2,7 @@
 
 void* memset(void* s, int c, size_t n)
 {
-	unsigned char* p = (unsigned char*)s;
+	unsigned char* p = static_cast<unsigned char*>(s);
 	for (size_t i = 0; i < n; i++)
 		p[i] = c;
 	return s;

libc/string/strcpy.cpp

@@ -1,6 +1,6 @@
 #include <string.h>
 
-char* strcpy(char* restrict dest, const char* restrict src)
+char* strcpy(char* __restrict dest, const char* __restrict src)
 {
 	size_t i;
 	for (i = 0; src[i]; i++)

libc/string/strncpy.cpp

@@ -1,6 +1,6 @@
 #include <string.h>
 
-char* strncpy(char* restrict dest, const char* restrict src, size_t n)
+char* strncpy(char* __restrict dest, const char* __restrict src, size_t n)
 {
 	size_t i;
 	for (i = 0; src[i] && i < n; i++)