* grub-core/fs/btrfs.c (grub_btrfs_read_logical): Silence spurious

	warning. Move variables before code while on it.

diff --git a/ChangeLog b/ChangeLog
index 505be20c2fee79c11c8d3034acb4c2273199cb19..ab247969ed065986e3133bf9a0abcefbdef950a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/btrfs.c (grub_btrfs_read_logical): Silence spurious
+       warning. Move variables before code while on it.
+
 2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fuloong support.

diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 42aa257d9c59f8db0da343165027d16ffb0ae8cb..59e91b5528e680de38a5b6f0dd0e76117b3da85a 100644 (file)
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -589,10 +589,14 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data,
       struct grub_btrfs_key *key;
       struct grub_btrfs_chunk_item *chunk;  
       grub_uint64_t csize;
-      grub_err_t err; 
+      grub_err_t err = 0; 
       struct grub_btrfs_key key_out;
       int challoc = 0;
       grub_device_t dev;
+      struct grub_btrfs_key key_in;
+      grub_size_t chsize;
+      grub_disk_addr_t chaddr;
+
       grub_dprintf ("btrfs", "searching for laddr %" PRIxGRUB_UINT64_T "\n",
                    addr);
       for (ptr = data->sblock.bootstrap_mapping;
@@ -616,9 +620,7 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data,
            + sizeof (struct grub_btrfs_chunk_stripe)
            * grub_le_to_cpu16 (chunk->nstripes);
        }
-      struct grub_btrfs_key key_in;
-      grub_size_t chsize;
-      grub_disk_addr_t chaddr;
+
       key_in.object_id = GRUB_BTRFS_OBJECT_ID_CHUNK;
       key_in.type = GRUB_BTRFS_ITEM_TYPE_CHUNK;
       key_in.offset = addr;