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

2008-08-31 Robert Millan <rmh@aybabtu.com>

Browse source 
* loader/i386/pc/multiboot.c (grub_get_multiboot_mmap_len): Fix
        declaration.
        (grub_multiboot): Fix a few warnings.
This commit is contained in:
robertmh 2008-08-31 20:43:03 +00:00
parent 21751d508a
commit 93d5cbf809
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-08-31 Robert Millan <rmh@aybabtu.com>
* loader/i386/pc/multiboot.c (grub_get_multiboot_mmap_len): Fix
declaration.
(grub_multiboot): Fix a few warnings.
2008-08-31 Robert Millan <rmh@aybabtu.com>
* loader/i386/pc/multiboot.c: Update comment not to say that

8
loader/i386/pc/multiboot.c
View file

@ -90,7 +90,7 @@ static grub_uint32_t mmap_length;
/* Return the length of the Multiboot mmap that will be needed to allocate
our platform's map. */
static grub_uint32_t
grub_get_multiboot_mmap_len ()
grub_get_multiboot_mmap_len (void)
{
grub_size_t count = 0;
@ -447,12 +447,12 @@ grub_multiboot (int argc, char *argv[])
if ((grub_file_seek (file, offset)) == (grub_off_t) - 1)
goto fail;
grub_file_read (file, grub_multiboot_payload_orig, load_size);
grub_file_read (file, (void *) grub_multiboot_payload_orig, load_size);
if (grub_errno)
goto fail;
if (header->bss_end_addr)
grub_memset (grub_multiboot_payload_orig + load_size, 0,
grub_memset ((void *) (grub_multiboot_payload_orig + load_size), 0,
header->bss_end_addr - header->load_addr - load_size);
grub_multiboot_payload_entry_offset = header->entry_addr - header->load_addr;
@ -462,7 +462,7 @@ grub_multiboot (int argc, char *argv[])
goto fail;
grub_fill_multiboot_mmap ((struct grub_mmap_entry *) (grub_multiboot_payload_orig
grub_fill_multiboot_mmap ((struct grub_multiboot_mmap_entry *) (grub_multiboot_payload_orig
+ grub_multiboot_payload_size
- mmap_length));