vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-07-02 Pavel Roskin <proski@gnu.org>

Browse source 
* disk/memdisk.c (memdisk_addr): Make a pointer to fix warnings.
	(memdisk): Make memdisk_orig_addr a pointer.
This commit is contained in:
proski 2008-07-02 20:18:51 +00:00
parent c9c8e6063f
commit b8fbce0ab9
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-07-02 Pavel Roskin <proski@gnu.org> 2008-07-02 Pavel Roskin <proski@gnu.org>
* 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 * fs/reiserfs.c (grub_reiserfs_read): Fix misuse of grub_size_t
for file offsets, use grub_off_t instead. Fix printf format for file offsets, use grub_off_t instead. Fix printf format
warnings. warnings.

6
disk/memdisk.c
View file

@ -25,7 +25,7 @@
#include <grub/types.h> #include <grub/types.h>
#include <grub/machine/kernel.h> #include <grub/machine/kernel.h>
static grub_addr_t memdisk_addr; static char *memdisk_addr;
static grub_off_t memdisk_size = 0; static grub_off_t memdisk_size = 0;
static int static int
@ -82,13 +82,13 @@ static struct grub_disk_dev grub_memdisk_dev =
GRUB_MOD_INIT(memdisk) GRUB_MOD_INIT(memdisk)
{ {
grub_addr_t memdisk_orig_addr; char *memdisk_orig_addr;
memdisk_size = grub_arch_memdisk_size (); memdisk_size = grub_arch_memdisk_size ();
if (! memdisk_size) if (! memdisk_size)
return; 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); grub_dprintf ("memdisk", "Found memdisk image at %p\n", memdisk_orig_addr);
memdisk_addr = grub_malloc (memdisk_size); memdisk_addr = grub_malloc (memdisk_size);