From b8fbce0ab9393d6850944ae95326bbbc62d9730b Mon Sep 17 00:00:00 2001 From: proski Date: Wed, 2 Jul 2008 20:18:51 +0000 Subject: [PATCH] 2008-07-02 Pavel Roskin * disk/memdisk.c (memdisk_addr): Make a pointer to fix warnings. (memdisk): Make memdisk_orig_addr a pointer. --- ChangeLog | 3 +++ disk/memdisk.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7eee7f23c..050ce284d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-07-02 Pavel Roskin + * disk/memdisk.c (memdisk_addr): Make a pointer to fix warnings. + (memdisk): Make memdisk_orig_addr a pointer. + * fs/reiserfs.c (grub_reiserfs_read): Fix misuse of grub_size_t for file offsets, use grub_off_t instead. Fix printf format warnings. diff --git a/disk/memdisk.c b/disk/memdisk.c index 840ef369c..d7f0670d1 100644 --- a/disk/memdisk.c +++ b/disk/memdisk.c @@ -25,7 +25,7 @@ #include #include -static grub_addr_t memdisk_addr; +static char *memdisk_addr; static grub_off_t memdisk_size = 0; static int @@ -82,13 +82,13 @@ static struct grub_disk_dev grub_memdisk_dev = GRUB_MOD_INIT(memdisk) { - grub_addr_t memdisk_orig_addr; + char *memdisk_orig_addr; memdisk_size = grub_arch_memdisk_size (); if (! memdisk_size) return; - memdisk_orig_addr = grub_arch_memdisk_addr (); + memdisk_orig_addr = (char *) grub_arch_memdisk_addr (); grub_dprintf ("memdisk", "Found memdisk image at %p\n", memdisk_orig_addr); memdisk_addr = grub_malloc (memdisk_size);