Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / payloads / libpayload / libc / memory.c

diff --git a/payloads/libpayload/libc/memory.c b/payloads/libpayload/libc/memory.c
index bf1f99b212cf5a15c919d8ae8f457ab9e129c028..4757b10596ed2f5c524d3c040401b604c934aded 100644 (file)
--- a/payloads/libpayload/libc/memory.c
+++ b/payloads/libpayload/libc/memory.c
@@ -46,6 +46,7 @@ void *memset(void *s, int c, size_t n)
 void *memcpy(void *dst, const void *src, size_t n)
 {
        int i;
+       void *ret = dst;
 
        for(i = 0; i < n % sizeof(unsigned long); i++)
                ((unsigned char *) dst)[i] = ((unsigned char *) src)[i];
@@ -57,7 +58,7 @@ void *memcpy(void *dst, const void *src, size_t n)
        for(i = 0; i < n / sizeof(unsigned long); i++)
                ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
 
-       return dst;
+       return ret;
 }
 
 void *memmove(void *dst, const void *src, size_t n)
@@ -71,7 +72,7 @@ void *memmove(void *dst, const void *src, size_t n)
        offs = n - (n % sizeof(unsigned long));
 
        for (i = (n % sizeof(unsigned long)) - 1; i >= 0; i--)
-               ((unsigned char *)dst)[i + offs] = 
+               ((unsigned char *)dst)[i + offs] =
                        ((unsigned char *)src)[i + offs];
 
        for (i = n / sizeof(unsigned long) - 1; i >= 0; i--)