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

Add missing parenthesis for conditional statement stanza.

Browse source
This commit is contained in:
jerone 2007-04-18 22:59:52 +00:00
parent 49892fdf50
commit 04582bb3bb
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-04-18 Jerone Young <jerone@gmail.com>
* kernel/elf.c: Add missing parenthesis for conditional statement
stanza.
2007-04-10 Jerone Young <jerone@gmail.com> 2007-04-10 Jerone Young <jerone@gmail.com>
* util/i386/pc/getroot.c: Update so that if root device is /dev/root , * util/i386/pc/getroot.c: Update so that if root device is /dev/root ,

2
kern/elf.c
View file

@ -432,6 +432,7 @@ grub_elf64_load (grub_elf_t _elf, grub_elf64_load_hook_t _load_hook,
grub_ssize_t read; grub_ssize_t read;
read = grub_file_read (elf->file, (void *) load_addr, phdr->p_filesz); read = grub_file_read (elf->file, (void *) load_addr, phdr->p_filesz);
if (read != (grub_ssize_t) phdr->p_filesz) if (read != (grub_ssize_t) phdr->p_filesz)
{
/* XXX How can we free memory from `load_hook'? */ /* XXX How can we free memory from `load_hook'? */
grub_error_push (); grub_error_push ();
return grub_error (GRUB_ERR_BAD_OS, return grub_error (GRUB_ERR_BAD_OS,
@ -439,6 +440,7 @@ grub_elf64_load (grub_elf_t _elf, grub_elf64_load_hook_t _load_hook,
"wanted 0x%lx bytes; read 0x%lx bytes.", "wanted 0x%lx bytes; read 0x%lx bytes.",
phdr->p_filesz, read); phdr->p_filesz, read);
} }
}
if (phdr->p_filesz < phdr->p_memsz) if (phdr->p_filesz < phdr->p_memsz)
grub_memset ((void *) (long) (load_addr + phdr->p_filesz), grub_memset ((void *) (long) (load_addr + phdr->p_filesz),