[coreboot] New patch to review for coreboot: 793064c libpayload: make functions static that are unused outside memory.c
Ronald G. Minnich (rminnich@gmail.com)
gerrit at coreboot.org
Thu Feb 14 23:40:40 CET 2013
Ronald G. Minnich (rminnich at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2394
-gerrit
commit 793064caa6de62baaa4ea2ad1a4852bc291092e1
Author: Ronald G. Minnich <rminnich at gmail.com>
Date: Thu Feb 14 14:36:46 2013 -0800
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
Change-Id: Id54c1fd172c78748f01a958ce4065dd0eb53bbc3
Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
---
payloads/libpayload/include/libpayload.h | 5 +++++
payloads/libpayload/libc/memory.c | 29 +++++++++++++++--------------
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index eaa0d0d..d1b9de8 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -294,6 +294,11 @@ long long int llabs(long long int j);
u8 bin2hex(u8 b);
u8 hex2bin(u8 h);
void fatal(const char *msg) __attribute__ ((noreturn));
+
+void *default_memset(void *s, int c, size_t n);
+void *default_memcpy(void *dst, const void *src, size_t n);
+void *default_memmove(void *dst, const void *src, size_t n);
+int default_memcmp(const void *s1, const void *s2, size_t len);
/** @} */
diff --git a/payloads/libpayload/libc/memory.c b/payloads/libpayload/libc/memory.c
index 5af8538..12d7e33 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")));
+
More information about the coreboot
mailing list