From b06bbb1e2a100095da21e18139e4f960604d0d02 Mon Sep 17 00:00:00 2001 From: solar Date: Sun, 18 Jan 2004 15:54:19 +0000 Subject: [PATCH] Minimized include scope. --- functions/string/memchr.c | 3 ++- functions/string/memcmp.c | 2 +- functions/string/memcpy.c | 2 +- functions/string/memmove.c | 2 +- functions/string/memset.c | 2 +- functions/string/strxfrm.c | 21 +++++++++++---------- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/functions/string/memchr.c b/functions/string/memchr.c index a584568..6a09649 100644 --- 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 +#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 fdda92c..35def11 100644 --- 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 +#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 2990952..de512ae 100644 --- 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 +#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 7a1cf7a..06f6774 100644 --- 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 +#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 f922867..48477a7 100644 --- 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 +#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 96c29e1..5b0fabb 100644 --- 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; } -*/ -- 2.40.0