]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
btrfs: avoid "used uninitialized" error with GCC7
authorAndrei Borzenkov <arvidjaar@gmail.com>
Tue, 4 Apr 2017 16:22:32 +0000 (19:22 +0300)
committerAndrei Borzenkov <arvidjaar@gmail.com>
Tue, 4 Apr 2017 16:22:32 +0000 (19:22 +0300)
sblock was local and so considered new variable on every loop
iteration.

Closes: 50597
grub-core/fs/btrfs.c

index 9cffa91fafb081c4a161b38e0710b28c19f48aa0..4849c1ceb6533c1b19eb64d754d45d44282b5acb 100644 (file)
@@ -227,11 +227,11 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data,
 static grub_err_t
 read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
 {
+  struct grub_btrfs_superblock sblock;
   unsigned i;
   grub_err_t err = GRUB_ERR_NONE;
   for (i = 0; i < ARRAY_SIZE (superblock_sectors); i++)
     {
-      struct grub_btrfs_superblock sblock;
       /* Don't try additional superblocks beyond device size.  */
       if (i && (grub_le_to_cpu64 (sblock.this_device.size)
                >> GRUB_DISK_SECTOR_BITS) <= superblock_sectors[i])