summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2013-02-14 14:36:46 -0800
committerGabe Black <gabeblack@chromium.org>2013-02-15 06:51:17 +0100
commitc1ee8641cb350de289fd77e9e9231bda46d6a386 (patch)
treebe4cd925343e698f2cd9af6ca0d2d5642a850a8d /payloads
parentf2e10cb544996872298c95ed23241149e3eab418 (diff)
downloadcoreboot-c1ee8641cb350de289fd77e9e9231bda46d6a386.tar.xz
libpayload: make functions static that are unused outside memory.c
The default_ functions in memory.c are only used to initialize a weak variable. They should not be used outside memory.c. Make them invisible. Remove the declaration from libpayload.h. For real this time. Change-Id: Id54c1fd172c78748f01a958ce4065dd0eb53bbc3 Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-on: http://review.coreboot.org/2394 Tested-by: build bot (Jenkins) Reviewed-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/libc/memory.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/payloads/libpayload/libc/memory.c b/payloads/libpayload/libc/memory.c
index 5af85389fe..12d7e33dfd 100644
--- a/payloads/libpayload/libc/memory.c
+++ b/payloads/libpayload/libc/memory.c
@@ -33,10 +33,7 @@
#include <libpayload.h>
-void *memset(void *s, int c, size_t n)
- __attribute__((weak, alias("default_memset")));
-
-void *default_memset(void *s, int c, size_t n)
+static void *default_memset(void *s, int c, size_t n)
{
char *os = s;
@@ -46,10 +43,10 @@ void *default_memset(void *s, int c, size_t n)
return s;
}
-void *memcpy(void *dst, const void *src, size_t n)
- __attribute__((weak, alias("default_memcpy")));
+void *memset(void *s, int c, size_t n)
+ __attribute__((weak, alias("default_memset")));
-void *default_memcpy(void *dst, const void *src, size_t n)
+static void *default_memcpy(void *dst, const void *src, size_t n)
{
int i;
void *ret = dst;
@@ -67,10 +64,10 @@ void *default_memcpy(void *dst, const void *src, size_t n)
return ret;
}
-void *memmove(void *dst, const void *src, size_t n)
- __attribute__((weak, alias("default_memmove")));
+void *memcpy(void *dst, const void *src, size_t n)
+ __attribute__((weak, alias("default_memcpy")));
-void *default_memmove(void *dst, const void *src, size_t n)
+static void *default_memmove(void *dst, const void *src, size_t n)
{
int i;
unsigned long offs;
@@ -90,6 +87,9 @@ void *default_memmove(void *dst, const void *src, size_t n)
return dst;
}
+void *memmove(void *dst, const void *src, size_t n)
+ __attribute__((weak, alias("default_memmove")));
+
/**
* Compare two memory areas.
*
@@ -100,11 +100,12 @@ void *default_memmove(void *dst, const void *src, size_t n)
* Otherwise return non-zero.
*/
-int memcmp(const void *s1, const void *s2, size_t len)
- __attribute__((weak, alias("default_memcmp")));
-
-int default_memcmp(const void *s1, const void *s2, size_t len)
+static int default_memcmp(const void *s1, const void *s2, size_t len)
{
for (; len && *(char *)s1++ == *(char *)s2++; len--) ;
return len;
}
+
+int memcmp(const void *s1, const void *s2, size_t len)
+ __attribute__((weak, alias("default_memcmp")));
+