Minimized include scope.

diff --git a/functions/string/memchr.c b/functions/string/memchr.c
index a584568a22dc4a9c992b8953f8d3780deff670fa..6a09649903787a88a28640159a7e6bb87d16e95d 100644 (file)
--- a/functions/string/memchr.c
+++ b/functions/string/memchr.c
@@ -5,7 +5,8 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-#include <string.h>
+#include <__size_t.h>
+#include <__NULL.h>
 
 void * memchr( const void * src, int c, size_t n )
 {

diff --git a/functions/string/memcmp.c b/functions/string/memcmp.c
index fdda92ce7689a8aa6aaaf7c125587d79c1a167b2..35def11b33d4bc1e0c364501ba14e4b16e497735 100644 (file)
--- a/functions/string/memcmp.c
+++ b/functions/string/memcmp.c
@@ -5,7 +5,7 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-#include <string.h>
+#include <__size_t.h>
 
 int memcmp( const void * src_1, const void * src_2, size_t n )
 {

diff --git a/functions/string/memcpy.c b/functions/string/memcpy.c
index 2990952679275fba517edfb5fe0e50f23848eec7..de512aee858693fbc89971481ec83b7058103bd2 100644 (file)
--- a/functions/string/memcpy.c
+++ b/functions/string/memcpy.c
@@ -5,7 +5,7 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-#include <string.h>
+#include <__size_t.h>
 
 void * memcpy( void * restrict dest, const void * restrict src, size_t n )
 {

diff --git a/functions/string/memmove.c b/functions/string/memmove.c
index 7a1cf7a29d90aa7a35f643be51a50ab1d2d7d0b2..06f67741ef7fc8270e6737957932c747164645e6 100644 (file)
--- a/functions/string/memmove.c
+++ b/functions/string/memmove.c
@@ -5,7 +5,7 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-#include <string.h>
+#include <__size_t.h>
 
 void * memmove( void * dest, const void * src, size_t n )
 {

diff --git a/functions/string/memset.c b/functions/string/memset.c
index f922867bd04549919d61c85c86f74e207b932b7f..48477a71778934b15d517391f5f1530c93967516 100644 (file)
--- a/functions/string/memset.c
+++ b/functions/string/memset.c
@@ -5,7 +5,7 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-#include <string.h>
+#include <__size_t.h>
 
 void * memset( void * dest, int c, size_t n )
 {

diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c
index 96c29e1c3b876c928ef1aba6b7824b77a6761ae7..5b0fabb3fa75ffe354a3cb516d8c7e936cdfc50d 100644 (file)
--- a/functions/string/strxfrm.c
+++ b/functions/string/strxfrm.c
@@ -5,18 +5,19 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-size_t strxfrm( char * restrict s1, const char * restrict s2, size_t n ) { /* TODO */ };
+#include <__size_t.h>
 
-/* PDPC code - unreviewed
+// TODO: Dummy function, no locale support yet.
+
+size_t strlen( const char * src );
+char * strncpy( char * restrict dest, const char * restrict src, size_t n );
+
+size_t strxfrm( char * restrict dest, const char * restrict src, size_t n )
 {
-    size_t oldlen;
-    
-    oldlen = strlen(s2);
-    if (oldlen < n)
+    size_t len = strlen( src );
+    if ( len < n )
     {
-        memcpy(s1, s2, oldlen);
-        s1[oldlen] = '\0';
+        strncpy( dest, src, len );
     }
-    return (oldlen);
+    return len;
 }
-*/