From 8cb17de77b2f95f7407464d043815e21449c859e Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 29 Feb 2012 14:55:09 +0100 Subject: [PATCH] * grub-core/disk/ldm.c (make_vg): Init part.name. (grub_ldm_detect): Silence spurious warning. (grub_util_is_ldm): Likewise. --- ChangeLog | 6 ++++++ grub-core/disk/ldm.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc4519145..6252c3d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-29 Vladimir Serbinenko + + * grub-core/disk/ldm.c (make_vg): Init part.name. + (grub_ldm_detect): Silence spurious warning. + (grub_util_is_ldm): Likewise. + 2012-02-29 Vladimir Serbinenko * grub-core/loader/i386/xnu.c (grub_xnu_boot): Init fsbfreq to diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c index f6fc4638c..e34963aa1 100644 --- a/grub-core/disk/ldm.c +++ b/grub-core/disk/ldm.c @@ -596,6 +596,7 @@ make_vg (grub_disk_t disk, grub_disk_addr_t start, size; grub_uint8_t *ptr; + part.name = 0; if (grub_memcmp (vblk[i].magic, LDM_VBLK_MAGIC, sizeof (vblk[i].magic)) != 0) continue; @@ -757,7 +758,7 @@ grub_ldm_detect (grub_disk_t disk, int i; for (i = 0; i < 3; i++) { - grub_disk_addr_t sector; + grub_disk_addr_t sector = LDM_LABEL_SECTOR; switch (i) { case 0: @@ -868,7 +869,7 @@ grub_util_is_ldm (grub_disk_t disk) int i; for (i = 0; i < 3; i++) { - grub_disk_addr_t sector; + grub_disk_addr_t sector = LDM_LABEL_SECTOR; grub_err_t err; struct grub_ldm_label label;