From 400102f63983e1e7dcb3b0e1f19251666708cd9e Mon Sep 17 00:00:00 2001 From: solar Date: Sun, 18 Jan 2004 15:32:54 +0000 Subject: [PATCH] Reviewed. --- functions/string/memmove.c | 31 ++++++++++++------------------- functions/string/memset.c | 26 +++++++------------------- 2 files changed, 19 insertions(+), 38 deletions(-) diff --git a/functions/string/memmove.c b/functions/string/memmove.c index ba73742..7a1cf7a 100644 --- a/functions/string/memmove.c +++ b/functions/string/memmove.c @@ -5,34 +5,27 @@ // This code is Public Domain. Use, modify, and redistribute at will. // ---------------------------------------------------------------------------- -void * memmove( void * s1, const void * s2, size_t n ) { /* TODO */ }; +#include -/* PDPC code - unreviewed +void * memmove( void * dest, const void * src, size_t n ) { - char *p = s1; - const char *cs2 = s2; - size_t x; - - if (p <= cs2) + const char * src_p = (const char *) src; + char * dest_p = (char *) dest; + if ( dest_p < src_p ) { - for (x=0; x < n; x++) + while ( n-- ) { - *p = *cs2; - p++; - cs2++; + *dest_p++ = *src_p++; } } else { - if (n != 0) + src_p += n; + dest_p += n; + while ( n-- ) { - for (x=n-1; x > 0; x--) - { - *(p+x) = *(cs2+x); - } + *dest_p-- = *src_p--; } - *(p+x) = *(cs2+x); } - return (s1); + return dest; } -*/ \ No newline at end of file diff --git a/functions/string/memset.c b/functions/string/memset.c index 3d4a64e..f922867 100644 --- a/functions/string/memset.c +++ b/functions/string/memset.c @@ -5,27 +5,15 @@ // This code is Public Domain. Use, modify, and redistribute at will. // ---------------------------------------------------------------------------- -void * memset( void * s, int c, size_t n ) { /* TODO */ }; +#include -/* Therx code +void * memset( void * dest, int c, size_t n ) { - unsigned short * tmp = (unsigned short *) s; // TODO: unsigned short? - for( ; n != 0; n-- ) + unsigned char ch = (unsigned char) c; + unsigned char * dest_p = (unsigned char *) dest; + while ( n-- ) { - *tmp++ = c; + *dest_p++ = ch; } - return s; + return dest; } -*/ - -/* PDPC code - unreviewed -{ - size_t x = 0; - - for (x = 0; x < n; x++) - { - *((char *)s + x) = (unsigned char)c; - } - return (s); -} -*/ -- 2.40.0