diff options
| author | Chris Ball <cjb@laptop.org> | 2011-03-07 10:05:21 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-10-25 09:18:32 -0400 |
| commit | fcdc0929c6ea051dad59818210df53fd03eaf4b1 (patch) | |
| tree | d2adab24e3a8f10db07ee82b1bdd3db4fc77ca67 /debug-tree.c | |
| parent | 29e6fc2aa637956ae57c5bf70208dea12e5b78cb (diff) | |
Fix unused-but-set errors in gcc-4.6
gcc-4.6 (as shipped in Fedora) turns on -Wunused-but-set-variable by
default, which breaks the build when combined with -Wall, e.g.:
debug-tree.c: In function ‘print_extent_leaf’:
debug-tree.c:45:13: error: variable ‘last_len’ set but not used [-Werror=unused-but-set-variable]
debug-tree.c:44:13: error: variable ‘last’ set but not used [-Werror=unused-but-set-variable]
debug-tree.c:41:21: error: variable ‘item’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
This patch fixes the errors by removing the unused variables.
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
Diffstat (limited to 'debug-tree.c')
| -rw-r--r-- | debug-tree.c | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/debug-tree.c b/debug-tree.c index 99c12d68..d21a8bd7 100644 --- a/debug-tree.c +++ b/debug-tree.c @@ -35,44 +35,6 @@ static int print_usage(void) exit(1); } -static void print_extent_leaf(struct btrfs_root *root, struct extent_buffer *l) -{ - int i; - struct btrfs_item *item; -// struct btrfs_extent_ref *ref; - struct btrfs_key key; - static u64 last = 0; - static u64 last_len = 0; - u32 nr = btrfs_header_nritems(l); - u32 type; - - for (i = 0 ; i < nr ; i++) { - item = btrfs_item_nr(l, i); - btrfs_item_key_to_cpu(l, &key, i); - type = btrfs_key_type(&key); - switch (type) { - case BTRFS_EXTENT_ITEM_KEY: - last_len = key.offset; - last = key.objectid; - break; -#if 0 - case BTRFS_EXTENT_REF_KEY: - ref = btrfs_item_ptr(l, i, struct btrfs_extent_ref); - printf("%llu %llu extent back ref root %llu gen %llu " - "owner %llu num_refs %lu\n", - (unsigned long long)last, - (unsigned long long)last_len, - (unsigned long long)btrfs_ref_root(l, ref), - (unsigned long long)btrfs_ref_generation(l, ref), - (unsigned long long)btrfs_ref_objectid(l, ref), - (unsigned long)btrfs_ref_num_refs(l, ref)); - break; -#endif - }; - fflush(stdout); - } -} - static void print_extents(struct btrfs_root *root, struct extent_buffer *eb) { int i; @@ -81,10 +43,7 @@ static void print_extents(struct btrfs_root *root, struct extent_buffer *eb) if (!eb) return; - if (btrfs_is_leaf(eb)) { - print_extent_leaf(root, eb); - return; - } + size = btrfs_level_size(root, btrfs_header_level(eb) - 1); nr = btrfs_header_nritems(eb); for (i = 0; i < nr; i++) { |