From: marco_g Date: Thu, 20 Jan 2005 17:25:39 +0000 (+0000) Subject: 2005-01-20 Marco Gerards X-Git-Tag: 1.98~2166 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=777aff39575154edb5e73d8cf2e1cae6ad393dc0;p=thirdparty%2Fgrub.git 2005-01-20 Marco Gerards * include/grub/mm.h (grub_mm_init_region): Change the type of the `unsigned' arguments to `grub_size_t'. (grub_malloc): Likewise. (grub_realloc): Likewise. (grub_memalign): Likewise. * kern/i386/dl.c (grub_arch_dl_check_header): Likewise. * kern/powerpc/dl.c (grub_arch_dl_check_header): Likewise. * util/misc.c (grub_malloc): Likewise. (grub_realloc): Likewise. * kern/mm.c (get_header_from_pointer): Change the casts to `unsigned' into a cast to `grub_size_t'. * fs/fshelp.c (grub_fshelp_find_file): The `oldnode' should always point to `currnode' when `currnode' is changed. * util/grub-emu.c (main): Initialize `progname'. Reported by Nico Schottelius . --- diff --git a/ChangeLog b/ChangeLog index 2d640b276..956f1933e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2005-01-20 Marco Gerards + + * include/grub/mm.h (grub_mm_init_region): Change the type of the + `unsigned' arguments to `grub_size_t'. + (grub_malloc): Likewise. + (grub_realloc): Likewise. + (grub_memalign): Likewise. + * kern/i386/dl.c (grub_arch_dl_check_header): Likewise. + * kern/powerpc/dl.c (grub_arch_dl_check_header): Likewise. + * util/misc.c (grub_malloc): Likewise. + (grub_realloc): Likewise. + * kern/mm.c (get_header_from_pointer): Change the casts to + `unsigned' into a cast to `grub_size_t'. + + * fs/fshelp.c (grub_fshelp_find_file): The `oldnode' should always + point to `currnode' when `currnode' is changed. + + * util/grub-emu.c (main): Initialize `progname'. Reported by Nico + Schottelius . + 2005-01-09 Hollis Blanchard * util/powerpc/ieee1275/grub-mkimage.c: Include . diff --git a/fs/fshelp.c b/fs/fshelp.c index af2f2b457..295c58f92 100644 --- a/fs/fshelp.c +++ b/fs/fshelp.c @@ -89,7 +89,7 @@ grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode, /* The node is found, stop iterating over the nodes. */ type = filetype; - oldnode = currnode == rootnode ? 0 : currnode; + oldnode = currnode; currnode = node; return 1; diff --git a/include/grub/mm.h b/include/grub/mm.h index 88877a9d0..876d4c201 100644 --- a/include/grub/mm.h +++ b/include/grub/mm.h @@ -24,11 +24,11 @@ #include #include -void grub_mm_init_region (void *addr, unsigned size); -void *EXPORT_FUNC(grub_malloc) (unsigned size); +void grub_mm_init_region (void *addr, grub_size_t size); +void *EXPORT_FUNC(grub_malloc) (grub_size_t size); void EXPORT_FUNC(grub_free) (void *ptr); -void *EXPORT_FUNC(grub_realloc) (void *ptr, unsigned size); -void *EXPORT_FUNC(grub_memalign) (unsigned align, unsigned size); +void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size); +void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size); /* For debugging. */ #define MM_DEBUG 1 diff --git a/kern/i386/dl.c b/kern/i386/dl.c index 49a5114d2..7e563c7d4 100644 --- a/kern/i386/dl.c +++ b/kern/i386/dl.c @@ -25,7 +25,7 @@ /* Check if EHDR is a valid ELF header. */ int -grub_arch_dl_check_header (void *ehdr, unsigned size) +grub_arch_dl_check_header (void *ehdr, grub_size_t size) { Elf32_Ehdr *e = ehdr; diff --git a/kern/mm.c b/kern/mm.c index 15b389824..035f93d1d 100644 --- a/kern/mm.c +++ b/kern/mm.c @@ -72,12 +72,12 @@ static grub_mm_region_t base; static void get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r) { - if ((unsigned) ptr & (GRUB_MM_ALIGN - 1)) + if ((grub_addr_t) ptr & (GRUB_MM_ALIGN - 1)) grub_fatal ("unaligned pointer %p", ptr); for (*r = base; *r; *r = (*r)->next) - if ((unsigned) ptr > (*r)->addr - && (unsigned) ptr <= (*r)->addr + (*r)->size) + if ((grub_addr_t) ptr > (*r)->addr + && (grub_addr_t) ptr <= (*r)->addr + (*r)->size) break; if (! *r) diff --git a/kern/powerpc/dl.c b/kern/powerpc/dl.c index a21ea9889..1b965c70b 100644 --- a/kern/powerpc/dl.c +++ b/kern/powerpc/dl.c @@ -25,7 +25,7 @@ /* Check if EHDR is a valid ELF header. */ int -grub_arch_dl_check_header (void *ehdr, unsigned size) +grub_arch_dl_check_header (void *ehdr, grub_size_t size) { Elf32_Ehdr *e = ehdr; diff --git a/util/grub-emu.c b/util/grub-emu.c index ae2206bfb..c2b7c8e52 100644 --- a/util/grub-emu.c +++ b/util/grub-emu.c @@ -135,7 +135,9 @@ main (int argc, char *argv[]) .dir = DEFAULT_DIRECTORY, .dev_map = DEFAULT_DEVICE_MAP }; - + + progname = "grub-emu"; + argp_parse (&argp, argc, argv, 0, 0, &args); /* More sure there is a root device. */ diff --git a/util/misc.c b/util/misc.c index a9dafb7b7..49480ee0f 100644 --- a/util/misc.c +++ b/util/misc.c @@ -206,7 +206,7 @@ grub_util_write_image (const char *img, size_t size, FILE *out) } void * -grub_malloc (unsigned size) +grub_malloc (grub_size_t size) { return xmalloc (size); } @@ -218,7 +218,7 @@ grub_free (void *ptr) } void * -grub_realloc (void *ptr, unsigned size) +grub_realloc (void *ptr, grub_size_t size) { return xrealloc (ptr, size); }