From 7666e8d31befe825d766f90350a438ba99ac4c6e Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 2 May 2007 22:56:21 +0000 Subject: [PATCH] Use size_t (instead of int) whereever the manpage of the respective function specifies size_t. Signed-off-by: Uwe Hermann Acked-by: Peter Stuge git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@301 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- include/string.h | 8 ++++---- lib/mem.c | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/string.h b/include/string.h index 3d5819836f..be5023fa04 100644 --- a/include/string.h +++ b/include/string.h @@ -24,10 +24,10 @@ #include /* Prototypes for functions from lib/mem.c. */ -extern void *memcpy(void *dest, const void *src, int len); -extern void *memmove(void *dest, const void *src, int len); -extern void *memset(void *v, unsigned char a, int len); -extern int memcmp(const void *s1, const void *s2, int len); +extern void *memcpy(void *dest, const void *src, size_t len); +extern void *memmove(void *dest, const void *src, size_t len); +extern void *memset(void *v, unsigned char a, size_t len); +extern int memcmp(const void *s1, const void *s2, size_t len); /* Prototypes for functions from console/vsprintf.c. */ extern int sprintf(char *buf, const char *fmt, ...); diff --git a/lib/mem.c b/lib/mem.c index b727d19783..f0c90e7192 100644 --- a/lib/mem.c +++ b/lib/mem.c @@ -44,7 +44,8 @@ * @param len Number of bytes to copy. * @param backwards Start at the end, used by memmove() when dest > src. */ -static void memcpy_helper(void *dest, const void *src, int len, int backwards) +static void memcpy_helper(void *dest, const void *src, size_t len, + int backwards) { u8 *d = dest; const u8 *s = src; @@ -108,7 +109,7 @@ static void memcpy_helper(void *dest, const void *src, int len, int backwards) * @param src Pointer to the source memory area. * @param len Number of bytes to copy. */ -void memcpy(void *dest, const void *src, int len) +void memcpy(void *dest, const void *src, size_t len) { memcpy_helper(dest, src, len, 0); } @@ -122,7 +123,7 @@ void memcpy(void *dest, const void *src, int len) * @param src Pointer to the source memory area. * @param len Number of bytes to copy. */ -void memmove(void *dest, const void *src, int len) +void memmove(void *dest, const void *src, size_t len) { memcpy_helper(dest, src, len, dest > src && dest < (src + len)); } @@ -134,7 +135,7 @@ void memmove(void *dest, const void *src, int len) * @param a The byte which is used for filling the memory area. * @param len The number of bytes to write. */ -void memset(void *v, unsigned char a, int len) +void memset(void *v, unsigned char a, size_t len) { unsigned char *cp = v; while (len--) @@ -152,7 +153,7 @@ void memset(void *v, unsigned char a, int len) * @return Returns a negative number if s1 is shorter than s2. Returns zero if * s1 matches s2. Returns a positive number if s1 is longer than s2. */ -int memcmp(const void *s1, const void *s2, int len) +int memcmp(const void *s1, const void *s2, size_t len) { const unsigned char *d = (const unsigned char *)s1; const unsigned char *s = (const unsigned char *)s2;