diff packages/redboot/current/src/misc_funs.c @ 130:eb9fd8c04db3 ecos-sw-2000-10-23

Merge from eCos master repository on 2000-10-23-17:01:37-BST
author jlarmour
date Mon, 23 Oct 2000 17:10:57 +0000
parents 6ed91473a1cd
children 6b5f480c6929
line wrap: on
line diff
--- a/packages/redboot/current/src/misc_funs.c
+++ b/packages/redboot/current/src/misc_funs.c
@@ -64,14 +64,16 @@ strcmp(const char *s1, const char *s2)
     return ((unsigned char)c1 - (unsigned char)c2);
 }
 
-void
+char *
 strcpy(char *s1, const char *s2)
 {
     char c;
+    char *_s1 = s1;
 
     while ((c = *s2++) != '\0')
         *s1++ = c;
     *s1 = '\0';
+    return _s1;
 }
 
 int
@@ -116,15 +118,11 @@ strncmpci(const char *s1, const char *s2
     return 0;
 }
 
-void
-memmove(unsigned char *dst, unsigned char *src, int len)
+int
+memcmp(const void *_dst, const void *_src, size_t len)
 {
-    while (len-- > 0) *dst++ = *src++;
-}
-
-int
-memcmp(const unsigned char *dst, const unsigned char *src, int len)
-{
+    unsigned char *dst = (unsigned char *)_dst;
+    unsigned char *src = (unsigned char *)_src;
     while (len-- > 0) {
         if (*dst++ != *src++) {
             return (*--dst - *--src);
@@ -132,11 +130,3 @@ memcmp(const unsigned char *dst, const u
     }
     return 0;
 }
-
-void
-memset(unsigned char *dst, unsigned char val, int len)
-{
-    while (--len >= 0) {
-        *dst++ = val;
-    }
-}