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

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

Browse source 
* commands/blocklist.c (grub_cmd_blocklist): Fix format warning.
	* commands/cmp.c (grub_cmd_cmp): Likewise.
	* kern/dl.c (grub_dl_flush_cache): Likewise.
	(grub_dl_load_core): Likewise.
	* kern/elf.c (grub_elf32_load_phdrs): Likewise.
	(grub_elf64_load_phdrs): Likewise.
This commit is contained in:
proski 2008-07-14 04:46:19 +00:00
parent fe9870876d
commit e4e8eaa5b3
5 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-07-14 Pavel Roskin <proski@gnu.org>
* commands/blocklist.c (grub_cmd_blocklist): Fix format warning.
* commands/cmp.c (grub_cmd_cmp): Likewise.
* kern/dl.c (grub_dl_flush_cache): Likewise.
(grub_dl_load_core): Likewise.
* kern/elf.c (grub_elf32_load_phdrs): Likewise.
(grub_elf64_load_phdrs): Likewise.
2008-07-13 Pavel Roskin <proski@gnu.org> 2008-07-13 Pavel Roskin <proski@gnu.org>
* lib/LzmaEnc.c (LzmaEnc_SetProps): Fix warning about comparison * lib/LzmaEnc.c (LzmaEnc_SetProps): Fix warning about comparison

2
commands/blocklist.c
View file

@ -72,7 +72,7 @@ grub_cmd_blocklist (struct grub_arg_list *state __attribute__ ((unused)),
if (num_entries++) if (num_entries++)
grub_printf (","); grub_printf (",");
grub_printf ("%llu", sector - part_start); grub_printf ("%llu", (unsigned long long) (sector - part_start));
if (num > 0) if (num > 0)
grub_printf ("+%u", num); grub_printf ("+%u", num);
if (offset != 0 || length != 0) if (offset != 0 || length != 0)

6
commands/cmp.c
View file

@ -51,8 +51,8 @@ grub_cmd_cmp (struct grub_arg_list *state __attribute__ ((unused)),
if (grub_file_size (file1) != grub_file_size (file2)) if (grub_file_size (file1) != grub_file_size (file2))
grub_printf ("Differ in size: %llu [%s], %llu [%s]\n", grub_printf ("Differ in size: %llu [%s], %llu [%s]\n",
grub_file_size (file1), args[0], (unsigned long long) grub_file_size (file1), args[0],
grub_file_size (file2), args[1]); (unsigned long long) grub_file_size (file2), args[1]);
else else
{ {
pos = 0; pos = 0;
@ -78,7 +78,7 @@ grub_cmd_cmp (struct grub_arg_list *state __attribute__ ((unused)),
if (buf1[i] != buf2[i]) if (buf1[i] != buf2[i])
{ {
grub_printf ("Differ at the offset %llu: 0x%x [%s], 0x%x [%s]\n", grub_printf ("Differ at the offset %llu: 0x%x [%s], 0x%x [%s]\n",
i + pos, buf1[i], args[0], (unsigned long long) (i + pos), buf1[i], args[0],
buf2[i], args[1]); buf2[i], args[1]);
goto cleanup; goto cleanup;
} }

7
kern/dl.c
View file

@ -509,8 +509,8 @@ grub_dl_flush_cache (grub_dl_t mod)
for (seg = mod->segment; seg; seg = seg->next) { for (seg = mod->segment; seg; seg = seg->next) {
if (seg->size) { if (seg->size) {
grub_dprintf ("modules", "flushing 0x%x bytes at %p\n", seg->size, grub_dprintf ("modules", "flushing 0x%lx bytes at %p\n",
seg->addr); (unsigned long) seg->size, seg->addr);
grub_arch_sync_caches (seg->addr, seg->size); grub_arch_sync_caches (seg->addr, seg->size);
} }
} }
@ -523,7 +523,8 @@ grub_dl_load_core (void *addr, grub_size_t size)
Elf_Ehdr *e; Elf_Ehdr *e;
grub_dl_t mod; grub_dl_t mod;
grub_dprintf ("modules", "module at %p, size 0x%x\n", addr, size); grub_dprintf ("modules", "module at %p, size 0x%lx\n", addr,
(unsigned long) size);
e = addr; e = addr;
if (grub_dl_check_header (e, size)) if (grub_dl_check_header (e, size))
return 0; return 0;

8
kern/elf.c
View file

@ -123,9 +123,9 @@ grub_elf32_load_phdrs (grub_elf_t elf)
phdrs_size = elf->ehdr.ehdr32.e_phnum * elf->ehdr.ehdr32.e_phentsize; phdrs_size = elf->ehdr.ehdr32.e_phnum * elf->ehdr.ehdr32.e_phentsize;
grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%x.\n", grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
(unsigned long long) elf->ehdr.ehdr32.e_phoff, (unsigned long long) elf->ehdr.ehdr32.e_phoff,
phdrs_size); (unsigned long) phdrs_size);
elf->phdrs = grub_malloc (phdrs_size); elf->phdrs = grub_malloc (phdrs_size);
if (! elf->phdrs) if (! elf->phdrs)
@ -301,9 +301,9 @@ grub_elf64_load_phdrs (grub_elf_t elf)
phdrs_size = elf->ehdr.ehdr64.e_phnum * elf->ehdr.ehdr64.e_phentsize; phdrs_size = elf->ehdr.ehdr64.e_phnum * elf->ehdr.ehdr64.e_phentsize;
grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%x.\n", grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
(unsigned long long) elf->ehdr.ehdr64.e_phoff, (unsigned long long) elf->ehdr.ehdr64.e_phoff,
phdrs_size); (unsigned long) phdrs_size);
elf->phdrs = grub_malloc (phdrs_size); elf->phdrs = grub_malloc (phdrs_size);
if (! elf->phdrs) if (! elf->phdrs)