[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1843] 2008-08-31 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[1843] 2008-08-31 Robert Millan <address@hidden> |
Date: |
Sun, 31 Aug 2008 20:43:04 +0000 |
Revision: 1843
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1843
Author: robertmh
Date: 2008-08-31 20:43:03 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
2008-08-31 Robert Millan <address@hidden>
* loader/i386/pc/multiboot.c (grub_get_multiboot_mmap_len): Fix
declaration.
(grub_multiboot): Fix a few warnings.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/loader/i386/pc/multiboot.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-08-31 19:25:41 UTC (rev 1842)
+++ trunk/grub2/ChangeLog 2008-08-31 20:43:03 UTC (rev 1843)
@@ -1,5 +1,11 @@
2008-08-31 Robert Millan <address@hidden>
+ * loader/i386/pc/multiboot.c (grub_get_multiboot_mmap_len): Fix
+ declaration.
+ (grub_multiboot): Fix a few warnings.
+
+2008-08-31 Robert Millan <address@hidden>
+
* loader/i386/pc/multiboot.c: Update comment not to say that
boot_device support is unimplemented.
Modified: trunk/grub2/loader/i386/pc/multiboot.c
===================================================================
--- trunk/grub2/loader/i386/pc/multiboot.c 2008-08-31 19:25:41 UTC (rev
1842)
+++ trunk/grub2/loader/i386/pc/multiboot.c 2008-08-31 20:43:03 UTC (rev
1843)
@@ -90,7 +90,7 @@
/* 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 @@
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,9 +462,9 @@
goto fail;
- grub_fill_multiboot_mmap ((struct grub_mmap_entry *)
(grub_multiboot_payload_orig
- +
grub_multiboot_payload_size
- - mmap_length));
+ grub_fill_multiboot_mmap ((struct grub_multiboot_mmap_entry *)
(grub_multiboot_payload_orig
+ +
grub_multiboot_payload_size
+ -
mmap_length));
mmap_addr = grub_multiboot_payload_dest + grub_multiboot_payload_size -
mmap_length;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1843] 2008-08-31 Robert Millan <address@hidden>,
Robert Millan <=