diff options
| author | Ronald G. Minnich <rminnich@gmail.com> | 2007-02-23 12:36:43 +0000 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2007-02-23 12:36:43 +0000 |
| commit | f1545d6a9b4143c377a6e87bc3bc109a71bd8020 (patch) | |
| tree | 27ffc0dbf4a779866da58c3c24577a03c8e71286 /lib | |
| parent | b08b26ebcbdd97ddb3e459fe9033b3de7363ae0d (diff) | |
| download | coreboot-f1545d6a9b4143c377a6e87bc3bc109a71bd8020.tar.gz coreboot-f1545d6a9b4143c377a6e87bc3bc109a71bd8020.tar.bz2 coreboot-f1545d6a9b4143c377a6e87bc3bc109a71bd8020.zip | |
fix mem.c declaration add size_t later once we understand the typedef
hell.
more fixes to elfboot.c. more coming.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@98 f3766cd6-281f-0410-b1cd-43a5c92072e9
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/elfboot.c | 4 | ||||
| -rw-r--r-- | lib/mem.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/elfboot.c b/lib/elfboot.c index ec310033146b..f2c64f8296c1 100644 --- a/lib/elfboot.c +++ b/lib/elfboot.c @@ -132,12 +132,12 @@ static struct verify_callback *process_elf_notes( switch(hdr->n_type) { case EIN_PROGRAM_NAME: if (n_desc[hdr->n_descsz -1] == 0) { - program = n_desc; + program = (char *) n_desc; } break; case EIN_PROGRAM_VERSION: if (n_desc[hdr->n_descsz -1] == 0) { - version = n_desc; + version = (char *) n_desc; } break; case EIN_PROGRAM_CHECKSUM: diff --git a/lib/mem.c b/lib/mem.c index f5526bb6a138..ba4c60ca35bb 100644 --- a/lib/mem.c +++ b/lib/mem.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA * */ +#include <arch/types.h> /* this one is pretty stupid. Won't handle overlaps, it's not efficient, etc. */ /* Please don't be silly and inline these. Inlines are not as wonderful as people think */ @@ -40,10 +41,10 @@ void memset(void *v, unsigned char a, int len) /* did you ever notice that the memcmp web page does not specify * a signed or unsigned compare? It matters ... oh well, we assumed unsigned */ -int memcmp(const void *s1, const void *s2, size_t n) +int memcmp(const void *s1, const void *s2, int len) { - const unsigned char *d = s1 - const unsigned char *s = s2; + const unsigned char *d = (const unsigned char *)s1; + const unsigned char *s = (const unsigned char *)s2; while (len--){ if (*d < *s) return -1; |