btrfs-progs: check: fix missing newlines
[platform/upstream/btrfs-progs.git] / print-tree.c
index 4ecf100..657497d 100644 (file)
@@ -31,35 +31,21 @@ static void print_dir_item_type(struct extent_buffer *eb,
                                 struct btrfs_dir_item *di)
 {
        u8 type = btrfs_dir_type(eb, di);
+       static const char* dir_item_str[] = {
+               [BTRFS_FT_REG_FILE]     = "FILE",
+               [BTRFS_FT_DIR]          = "DIR",
+               [BTRFS_FT_CHRDEV]       = "CHRDEV",
+               [BTRFS_FT_BLKDEV]       = "BLKDEV",
+               [BTRFS_FT_FIFO]         = "FIFO",
+               [BTRFS_FT_SOCK]         = "SOCK",
+               [BTRFS_FT_SYMLINK]      = "SYMLINK",
+               [BTRFS_FT_XATTR]        = "XATTR"
+       };
 
-       switch (type) {
-       case BTRFS_FT_REG_FILE:
-               printf("FILE");
-               break;
-       case BTRFS_FT_DIR:
-               printf("DIR");
-               break;
-       case BTRFS_FT_CHRDEV:
-               printf("CHRDEV");
-               break;
-       case BTRFS_FT_BLKDEV:
-               printf("BLKDEV");
-               break;
-       case BTRFS_FT_FIFO:
-               printf("FIFO");
-               break;
-       case BTRFS_FT_SOCK:
-               printf("SOCK");
-               break;
-       case BTRFS_FT_SYMLINK:
-               printf("SYMLINK");
-               break;
-       case BTRFS_FT_XATTR:
-               printf("XATTR");
-               break;
-       default:
-               printf("%u", type);
-       }
+       if (type < ARRAY_SIZE(dir_item_str) && dir_item_str[type])
+               printf("%s", dir_item_str[type]);
+       else
+               printf("DIR_ITEM.%u", type);
 }
 
 static void print_dir_item(struct extent_buffer *eb, u32 size,
@@ -501,7 +487,7 @@ static void print_extent_ref_v0(struct extent_buffer *eb, int slot)
 }
 #endif
 
-static void print_root_ref(struct extent_buffer *leaf, int slot, char *tag)
+static void print_root_ref(struct extent_buffer *leaf, int slot, const char *tag)
 {
        struct btrfs_root_ref *ref;
        char namebuf[BTRFS_NAME_LEN];
@@ -610,132 +596,58 @@ static void print_free_space_header(struct extent_buffer *leaf, int slot)
 
 void print_key_type(FILE *stream, u64 objectid, u8 type)
 {
+       static const char* key_to_str[256] = {
+               [BTRFS_INODE_ITEM_KEY]          = "INODE_ITEM",
+               [BTRFS_INODE_REF_KEY]           = "INODE_REF",
+               [BTRFS_INODE_EXTREF_KEY]        = "INODE_EXTREF",
+               [BTRFS_DIR_ITEM_KEY]            = "DIR_ITEM",
+               [BTRFS_DIR_INDEX_KEY]           = "DIR_INDEX",
+               [BTRFS_DIR_LOG_ITEM_KEY]        = "DIR_LOG_ITEM",
+               [BTRFS_DIR_LOG_INDEX_KEY]       = "DIR_LOG_INDEX",
+               [BTRFS_XATTR_ITEM_KEY]          = "XATTR_ITEM",
+               [BTRFS_ORPHAN_ITEM_KEY]         = "ORPHAN_ITEM",
+               [BTRFS_ROOT_ITEM_KEY]           = "ROOT_ITEM",
+               [BTRFS_ROOT_REF_KEY]            = "ROOT_REF",
+               [BTRFS_ROOT_BACKREF_KEY]        = "ROOT_BACKREF",
+               [BTRFS_EXTENT_ITEM_KEY]         = "EXTENT_ITEM",
+               [BTRFS_METADATA_ITEM_KEY]       = "METADATA_ITEM",
+               [BTRFS_TREE_BLOCK_REF_KEY]      = "TREE_BLOCK_REF",
+               [BTRFS_SHARED_BLOCK_REF_KEY]    = "SHARED_BLOCK_REF",
+               [BTRFS_EXTENT_DATA_REF_KEY]     = "EXTENT_DATA_REF",
+               [BTRFS_SHARED_DATA_REF_KEY]     = "SHARED_DATA_REF",
+               [BTRFS_EXTENT_REF_V0_KEY]       = "EXTENT_REF_V0",
+               [BTRFS_CSUM_ITEM_KEY]           = "CSUM_ITEM",
+               [BTRFS_EXTENT_CSUM_KEY]         = "EXTENT_CSUM",
+               [BTRFS_EXTENT_DATA_KEY]         = "EXTENT_DATA",
+               [BTRFS_BLOCK_GROUP_ITEM_KEY]    = "BLOCK_GROUP_ITEM",
+               [BTRFS_FREE_SPACE_INFO_KEY]     = "FREE_SPACE_INFO",
+               [BTRFS_FREE_SPACE_EXTENT_KEY]   = "FREE_SPACE_EXTENT",
+               [BTRFS_FREE_SPACE_BITMAP_KEY]   = "FREE_SPACE_BITMAP",
+               [BTRFS_CHUNK_ITEM_KEY]          = "CHUNK_ITEM",
+               [BTRFS_DEV_ITEM_KEY]            = "DEV_ITEM",
+               [BTRFS_DEV_EXTENT_KEY]          = "DEV_EXTENT",
+               [BTRFS_TEMPORARY_ITEM_KEY]      = "TEMPORARY_ITEM",
+               [BTRFS_DEV_REPLACE_KEY]         = "DEV_REPLACE",
+               [BTRFS_STRING_ITEM_KEY]         = "STRING_ITEM",
+               [BTRFS_QGROUP_STATUS_KEY]       = "QGROUP_STATUS",
+               [BTRFS_QGROUP_RELATION_KEY]     = "QGROUP_RELATION",
+               [BTRFS_QGROUP_INFO_KEY]         = "QGROUP_INFO",
+               [BTRFS_QGROUP_LIMIT_KEY]        = "QGROUP_LIMIT",
+               [BTRFS_PERSISTENT_ITEM_KEY]     = "PERSISTENT_ITEM",
+               [BTRFS_UUID_KEY_SUBVOL]         = "UUID_KEY_SUBVOL",
+               [BTRFS_UUID_KEY_RECEIVED_SUBVOL] = "UUID_KEY_RECEIVED_SUBVOL",
+       };
+
        if (type == 0 && objectid == BTRFS_FREE_SPACE_OBJECTID) {
                fprintf(stream, "UNTYPED");
                return;
        }
 
-       switch (type) {
-       case BTRFS_INODE_ITEM_KEY:
-               fprintf(stream, "INODE_ITEM");
-               break;
-       case BTRFS_INODE_REF_KEY:
-               fprintf(stream, "INODE_REF");
-               break;
-       case BTRFS_INODE_EXTREF_KEY:
-               fprintf(stream, "INODE_EXTREF");
-               break;
-       case BTRFS_DIR_ITEM_KEY:
-               fprintf(stream, "DIR_ITEM");
-               break;
-       case BTRFS_DIR_INDEX_KEY:
-               fprintf(stream, "DIR_INDEX");
-               break;
-       case BTRFS_DIR_LOG_ITEM_KEY:
-               fprintf(stream, "DIR_LOG_ITEM");
-               break;
-       case BTRFS_DIR_LOG_INDEX_KEY:
-               fprintf(stream, "DIR_LOG_INDEX");
-               break;
-       case BTRFS_XATTR_ITEM_KEY:
-               fprintf(stream, "XATTR_ITEM");
-               break;
-       case BTRFS_ORPHAN_ITEM_KEY:
-               fprintf(stream, "ORPHAN_ITEM");
-               break;
-       case BTRFS_ROOT_ITEM_KEY:
-               fprintf(stream, "ROOT_ITEM");
-               break;
-       case BTRFS_ROOT_REF_KEY:
-               fprintf(stream, "ROOT_REF");
-               break;
-       case BTRFS_ROOT_BACKREF_KEY:
-               fprintf(stream, "ROOT_BACKREF");
-               break;
-       case BTRFS_EXTENT_ITEM_KEY:
-               fprintf(stream, "EXTENT_ITEM");
-               break;
-       case BTRFS_METADATA_ITEM_KEY:
-               fprintf(stream, "METADATA_ITEM");
-               break;
-       case BTRFS_TREE_BLOCK_REF_KEY:
-               fprintf(stream, "TREE_BLOCK_REF");
-               break;
-       case BTRFS_SHARED_BLOCK_REF_KEY:
-               fprintf(stream, "SHARED_BLOCK_REF");
-               break;
-       case BTRFS_EXTENT_DATA_REF_KEY:
-               fprintf(stream, "EXTENT_DATA_REF");
-               break;
-       case BTRFS_SHARED_DATA_REF_KEY:
-               fprintf(stream, "SHARED_DATA_REF");
-               break;
-       case BTRFS_EXTENT_REF_V0_KEY:
-               fprintf(stream, "EXTENT_REF_V0");
-               break;
-       case BTRFS_CSUM_ITEM_KEY:
-               fprintf(stream, "CSUM_ITEM");
-               break;
-       case BTRFS_EXTENT_CSUM_KEY:
-               fprintf(stream, "EXTENT_CSUM");
-               break;
-       case BTRFS_EXTENT_DATA_KEY:
-               fprintf(stream, "EXTENT_DATA");
-               break;
-       case BTRFS_BLOCK_GROUP_ITEM_KEY:
-               fprintf(stream, "BLOCK_GROUP_ITEM");
-               break;
-       case BTRFS_FREE_SPACE_INFO_KEY:
-               fprintf(stream, "FREE_SPACE_INFO");
-               break;
-       case BTRFS_FREE_SPACE_EXTENT_KEY:
-               fprintf(stream, "FREE_SPACE_EXTENT");
-               break;
-       case BTRFS_FREE_SPACE_BITMAP_KEY:
-               fprintf(stream, "FREE_SPACE_BITMAP");
-               break;
-       case BTRFS_CHUNK_ITEM_KEY:
-               fprintf(stream, "CHUNK_ITEM");
-               break;
-       case BTRFS_DEV_ITEM_KEY:
-               fprintf(stream, "DEV_ITEM");
-               break;
-       case BTRFS_DEV_EXTENT_KEY:
-               fprintf(stream, "DEV_EXTENT");
-               break;
-       case BTRFS_BALANCE_ITEM_KEY:
-               fprintf(stream, "BALANCE_ITEM");
-               break;
-       case BTRFS_DEV_REPLACE_KEY:
-               fprintf(stream, "DEV_REPLACE");
-               break;
-       case BTRFS_STRING_ITEM_KEY:
-               fprintf(stream, "STRING_ITEM");
-               break;
-       case BTRFS_QGROUP_STATUS_KEY:
-               fprintf(stream, "QGROUP_STATUS");
-               break;
-       case BTRFS_QGROUP_RELATION_KEY:
-               fprintf(stream, "QGROUP_RELATION");
-               break;
-       case BTRFS_QGROUP_INFO_KEY:
-               fprintf(stream, "QGROUP_INFO");
-               break;
-       case BTRFS_QGROUP_LIMIT_KEY:
-               fprintf(stream, "QGROUP_LIMIT");
-               break;
-       case BTRFS_DEV_STATS_KEY:
-               fprintf(stream, "DEV_STATS");
-               break;
-       case BTRFS_UUID_KEY_SUBVOL:
-               fprintf(stream, "UUID_KEY_SUBVOL");
-               break;
-       case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
-               fprintf(stream, "UUID_KEY_RECEIVED_SUBVOL");
-               break;
-       default:
+
+       if (key_to_str[type])
+               fputs(key_to_str[type], stream);
+       else
                fprintf(stream, "UNKNOWN.%d", type);
-       };
 }
 
 void print_objectid(FILE *stream, u64 objectid, u8 type)
@@ -1026,102 +938,93 @@ static void print_dev_stats(struct extent_buffer *eb,
        }
 }
 
-void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
+void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 {
-       int i;
-       char *str;
        struct btrfs_item *item;
-       struct btrfs_dir_item *di;
-       struct btrfs_inode_item *ii;
-       struct btrfs_file_extent_item *fi;
-       struct btrfs_block_group_item *bi;
-       struct btrfs_extent_data_ref *dref;
-       struct btrfs_shared_data_ref *sref;
-       struct btrfs_inode_ref *iref;
-       struct btrfs_inode_extref *iref2;
-       struct btrfs_dev_extent *dev_extent;
        struct btrfs_disk_key disk_key;
-       struct btrfs_block_group_item bg_item;
-       struct btrfs_free_space_info *free_info;
-       struct btrfs_dir_log_item *dlog;
-       struct btrfs_qgroup_info_item *qg_info;
-       struct btrfs_qgroup_limit_item *qg_limit;
-       struct btrfs_qgroup_status_item *qg_status;
-       u32 nr = btrfs_header_nritems(l);
-       u64 objectid;
-       u32 type;
-       u64 offset;
-       char flags_str[256];
-       char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
-       u8 uuid[BTRFS_UUID_SIZE];
+       u32 i;
+       u32 nr;
+
+       nr = btrfs_header_nritems(eb);
 
        printf("leaf %llu items %d free space %d generation %llu owner %llu\n",
-               (unsigned long long)btrfs_header_bytenr(l), nr,
-               btrfs_leaf_free_space(root, l),
-               (unsigned long long)btrfs_header_generation(l),
-               (unsigned long long)btrfs_header_owner(l));
-       print_uuids(l);
+               (unsigned long long)btrfs_header_bytenr(eb), nr,
+               btrfs_leaf_free_space(root, eb),
+               (unsigned long long)btrfs_header_generation(eb),
+               (unsigned long long)btrfs_header_owner(eb));
+       print_uuids(eb);
        fflush(stdout);
-       for (i = 0 ; i < nr ; i++) {
+
+       for (i = 0; i < nr; i++) {
                u32 item_size;
+               void *ptr;
+               u64 objectid;
+               u32 type;
+               u64 offset;
+               char flags_str[256];
+               char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
+               u8 uuid[BTRFS_UUID_SIZE];
 
                item = btrfs_item_nr(i);
-               item_size = btrfs_item_size(l, item);
-               btrfs_item_key(l, &disk_key, i);
+               item_size = btrfs_item_size(eb, item);
+               /* Untyped extraction of slot from btrfs_item_ptr */
+               ptr = btrfs_item_ptr(eb, i, void*);
+
+               btrfs_item_key(eb, &disk_key, i);
                objectid = btrfs_disk_key_objectid(&disk_key);
                type = btrfs_disk_key_type(&disk_key);
                offset = btrfs_disk_key_offset(&disk_key);
+
                printf("\titem %d ", i);
                btrfs_print_key(&disk_key);
                printf(" itemoff %d itemsize %d\n",
-                       btrfs_item_offset(l, item),
-                       btrfs_item_size(l, item));
+                       btrfs_item_offset(eb, item),
+                       btrfs_item_size(eb, item));
 
                if (type == 0 && objectid == BTRFS_FREE_SPACE_OBJECTID)
-                       print_free_space_header(l, i);
+                       print_free_space_header(eb, i);
 
                switch (type) {
                case BTRFS_INODE_ITEM_KEY:
-                       ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
-                       print_inode_item(l, ii);
+                       print_inode_item(eb, ptr);
                        break;
                case BTRFS_INODE_REF_KEY:
-                       iref = btrfs_item_ptr(l, i, struct btrfs_inode_ref);
-                       print_inode_ref_item(l, item_size, iref);
+                       print_inode_ref_item(eb, item_size, ptr);
                        break;
                case BTRFS_INODE_EXTREF_KEY:
-                       iref2 = btrfs_item_ptr(l, i, struct btrfs_inode_extref);
-                       print_inode_extref_item(l, item_size, iref2);
+                       print_inode_extref_item(eb, item_size, ptr);
                        break;
                case BTRFS_DIR_ITEM_KEY:
                case BTRFS_DIR_INDEX_KEY:
                case BTRFS_XATTR_ITEM_KEY:
-                       di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
-                       print_dir_item(l, item_size, di);
+                       print_dir_item(eb, item_size, ptr);
                        break;
                case BTRFS_DIR_LOG_INDEX_KEY:
-               case BTRFS_DIR_LOG_ITEM_KEY:
-                       dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item);
+               case BTRFS_DIR_LOG_ITEM_KEY: {
+                       struct btrfs_dir_log_item *dlog;
+
+                       dlog = btrfs_item_ptr(eb, i, struct btrfs_dir_log_item);
                        printf("\t\tdir log end %Lu\n",
-                              (unsigned long long)btrfs_dir_log_end(l, dlog));
-                      break;
+                              (unsigned long long)btrfs_dir_log_end(eb, dlog));
+                       break;
+                       }
                case BTRFS_ORPHAN_ITEM_KEY:
                        printf("\t\torphan item\n");
                        break;
                case BTRFS_ROOT_ITEM_KEY:
-                       print_root(l, i);
+                       print_root(eb, i);
                        break;
                case BTRFS_ROOT_REF_KEY:
-                       print_root_ref(l, i, "ref");
+                       print_root_ref(eb, i, "ref");
                        break;
                case BTRFS_ROOT_BACKREF_KEY:
-                       print_root_ref(l, i, "backref");
+                       print_root_ref(eb, i, "backref");
                        break;
                case BTRFS_EXTENT_ITEM_KEY:
-                       print_extent_item(l, i, 0);
+                       print_extent_item(eb, i, 0);
                        break;
                case BTRFS_METADATA_ITEM_KEY:
-                       print_extent_item(l, i, 1);
+                       print_extent_item(eb, i, 1);
                        break;
                case BTRFS_TREE_BLOCK_REF_KEY:
                        printf("\t\ttree block backref\n");
@@ -1129,23 +1032,28 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                case BTRFS_SHARED_BLOCK_REF_KEY:
                        printf("\t\tshared block backref\n");
                        break;
-               case BTRFS_EXTENT_DATA_REF_KEY:
-                       dref = btrfs_item_ptr(l, i, struct btrfs_extent_data_ref);
+               case BTRFS_EXTENT_DATA_REF_KEY: {
+                       struct btrfs_extent_data_ref *dref;
+
+                       dref = btrfs_item_ptr(eb, i, struct btrfs_extent_data_ref);
                        printf("\t\textent data backref root %llu "
                               "objectid %llu offset %llu count %u\n",
-                              (unsigned long long)btrfs_extent_data_ref_root(l, dref),
-                              (unsigned long long)btrfs_extent_data_ref_objectid(l, dref),
-                              (unsigned long long)btrfs_extent_data_ref_offset(l, dref),
-                              btrfs_extent_data_ref_count(l, dref));
+                              (unsigned long long)btrfs_extent_data_ref_root(eb, dref),
+                              (unsigned long long)btrfs_extent_data_ref_objectid(eb, dref),
+                              (unsigned long long)btrfs_extent_data_ref_offset(eb, dref),
+                              btrfs_extent_data_ref_count(eb, dref));
                        break;
-               case BTRFS_SHARED_DATA_REF_KEY:
-                       sref = btrfs_item_ptr(l, i, struct btrfs_shared_data_ref);
+                       }
+               case BTRFS_SHARED_DATA_REF_KEY: {
+                       struct btrfs_shared_data_ref *sref;
+                       sref = btrfs_item_ptr(eb, i, struct btrfs_shared_data_ref);
                        printf("\t\tshared data backref count %u\n",
-                              btrfs_shared_data_ref_count(l, sref));
+                              btrfs_shared_data_ref_count(eb, sref));
                        break;
+                       }
                case BTRFS_EXTENT_REF_V0_KEY:
 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
-                       print_extent_ref_v0(l, i);
+                       print_extent_ref_v0(eb, i);
 #else
                        BUG();
 #endif
@@ -1157,14 +1065,12 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        printf("\t\textent csum item\n");
                        break;
                case BTRFS_EXTENT_DATA_KEY:
-                       fi = btrfs_item_ptr(l, i,
-                                           struct btrfs_file_extent_item);
-                       print_file_extent_item(l, item, i, fi);
+                       print_file_extent_item(eb, item, i, ptr);
                        break;
-               case BTRFS_BLOCK_GROUP_ITEM_KEY:
-                       bi = btrfs_item_ptr(l, i,
-                                           struct btrfs_block_group_item);
-                       read_extent_buffer(l, &bg_item, (unsigned long)bi,
+               case BTRFS_BLOCK_GROUP_ITEM_KEY: {
+                       struct btrfs_block_group_item bg_item;
+
+                       read_extent_buffer(eb, &bg_item, (unsigned long)ptr,
                                           sizeof(bg_item));
                        memset(flags_str, 0, sizeof(flags_str));
                        bg_flags_to_str(btrfs_block_group_flags(&bg_item),
@@ -1174,12 +1080,16 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                               (unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
                               flags_str);
                        break;
-               case BTRFS_FREE_SPACE_INFO_KEY:
-                       free_info = btrfs_item_ptr(l, i, struct btrfs_free_space_info);
+                       }
+               case BTRFS_FREE_SPACE_INFO_KEY: {
+                       struct btrfs_free_space_info *free_info;
+
+                       free_info = btrfs_item_ptr(eb, i, struct btrfs_free_space_info);
                        printf("\t\tfree space info extent count %u flags %u\n",
-                              (unsigned)btrfs_free_space_extent_count(l, free_info),
-                              (unsigned)btrfs_free_space_flags(l, free_info));
+                              (unsigned)btrfs_free_space_extent_count(eb, free_info),
+                              (unsigned)btrfs_free_space_flags(eb, free_info));
                        break;
+                       }
                case BTRFS_FREE_SPACE_EXTENT_KEY:
                        printf("\t\tfree space extent\n");
                        break;
@@ -1187,16 +1097,17 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        printf("\t\tfree space bitmap\n");
                        break;
                case BTRFS_CHUNK_ITEM_KEY:
-                       print_chunk(l, btrfs_item_ptr(l, i, struct btrfs_chunk));
+                       print_chunk(eb, ptr);
                        break;
                case BTRFS_DEV_ITEM_KEY:
-                       print_dev_item(l, btrfs_item_ptr(l, i,
-                                       struct btrfs_dev_item));
+                       print_dev_item(eb, ptr);
                        break;
-               case BTRFS_DEV_EXTENT_KEY:
-                       dev_extent = btrfs_item_ptr(l, i,
+               case BTRFS_DEV_EXTENT_KEY: {
+                       struct btrfs_dev_extent *dev_extent;
+
+                       dev_extent = btrfs_item_ptr(eb, i,
                                                    struct btrfs_dev_extent);
-                       read_extent_buffer(l, uuid,
+                       read_extent_buffer(eb, uuid,
                                (unsigned long)btrfs_dev_extent_chunk_tree_uuid(dev_extent),
                                BTRFS_UUID_SIZE);
                        uuid_unparse(uuid, uuid_str);
@@ -1205,88 +1116,97 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                               "length %llu\n"
                               "\t\tchunk_tree_uuid %s\n",
                               (unsigned long long)
-                              btrfs_dev_extent_chunk_tree(l, dev_extent),
+                              btrfs_dev_extent_chunk_tree(eb, dev_extent),
                               (unsigned long long)
-                              btrfs_dev_extent_chunk_objectid(l, dev_extent),
+                              btrfs_dev_extent_chunk_objectid(eb, dev_extent),
                               (unsigned long long)
-                              btrfs_dev_extent_chunk_offset(l, dev_extent),
+                              btrfs_dev_extent_chunk_offset(eb, dev_extent),
                               (unsigned long long)
-                              btrfs_dev_extent_length(l, dev_extent),
+                              btrfs_dev_extent_length(eb, dev_extent),
                               uuid_str);
                        break;
-               case BTRFS_QGROUP_STATUS_KEY:
-                       qg_status = btrfs_item_ptr(l, i,
+                       }
+               case BTRFS_QGROUP_STATUS_KEY: {
+                       struct btrfs_qgroup_status_item *qg_status;
+
+                       qg_status = btrfs_item_ptr(eb, i,
                                        struct btrfs_qgroup_status_item);
                        memset(flags_str, 0, sizeof(flags_str));
-                       qgroup_flags_to_str(btrfs_qgroup_status_flags(l, qg_status),
+                       qgroup_flags_to_str(btrfs_qgroup_status_flags(eb, qg_status),
                                        flags_str);
                        printf("\t\tversion %llu generation %llu flags %s "
                                "scan %lld\n",
                                (unsigned long long)
-                               btrfs_qgroup_status_version(l, qg_status),
+                               btrfs_qgroup_status_version(eb, qg_status),
                                (unsigned long long)
-                               btrfs_qgroup_status_generation(l, qg_status),
+                               btrfs_qgroup_status_generation(eb, qg_status),
                                flags_str,
                                (unsigned long long)
-                               btrfs_qgroup_status_rescan(l, qg_status));
+                               btrfs_qgroup_status_rescan(eb, qg_status));
                        break;
+                       }
                case BTRFS_QGROUP_RELATION_KEY:
                        break;
-               case BTRFS_QGROUP_INFO_KEY:
-                       qg_info = btrfs_item_ptr(l, i,
+               case BTRFS_QGROUP_INFO_KEY: {
+                       struct btrfs_qgroup_info_item *qg_info;
+
+                       qg_info = btrfs_item_ptr(eb, i,
                                                 struct btrfs_qgroup_info_item);
                        printf("\t\tgeneration %llu\n"
                             "\t\treferenced %llu referenced_compressed %llu\n"
                             "\t\texclusive %llu exclusive_compressed %llu\n",
                               (unsigned long long)
-                              btrfs_qgroup_info_generation(l, qg_info),
+                              btrfs_qgroup_info_generation(eb, qg_info),
                               (unsigned long long)
-                              btrfs_qgroup_info_referenced(l, qg_info),
+                              btrfs_qgroup_info_referenced(eb, qg_info),
                               (unsigned long long)
-                              btrfs_qgroup_info_referenced_compressed(l,
+                              btrfs_qgroup_info_referenced_compressed(eb,
                                                                       qg_info),
                               (unsigned long long)
-                              btrfs_qgroup_info_exclusive(l, qg_info),
+                              btrfs_qgroup_info_exclusive(eb, qg_info),
                               (unsigned long long)
-                              btrfs_qgroup_info_exclusive_compressed(l,
+                              btrfs_qgroup_info_exclusive_compressed(eb,
                                                                      qg_info));
                        break;
-               case BTRFS_QGROUP_LIMIT_KEY:
-                       qg_limit = btrfs_item_ptr(l, i,
+                       }
+               case BTRFS_QGROUP_LIMIT_KEY: {
+                       struct btrfs_qgroup_limit_item *qg_limit;
+
+                       qg_limit = btrfs_item_ptr(eb, i,
                                         struct btrfs_qgroup_limit_item);
                        printf("\t\tflags %llx\n"
                             "\t\tmax_referenced %lld max_exclusive %lld\n"
                             "\t\trsv_referenced %lld rsv_exclusive %lld\n",
                               (unsigned long long)
-                              btrfs_qgroup_limit_flags(l, qg_limit),
+                              btrfs_qgroup_limit_flags(eb, qg_limit),
                               (long long)
-                              btrfs_qgroup_limit_max_referenced(l, qg_limit),
+                              btrfs_qgroup_limit_max_referenced(eb, qg_limit),
                               (long long)
-                              btrfs_qgroup_limit_max_exclusive(l, qg_limit),
+                              btrfs_qgroup_limit_max_exclusive(eb, qg_limit),
                               (long long)
-                              btrfs_qgroup_limit_rsv_referenced(l, qg_limit),
+                              btrfs_qgroup_limit_rsv_referenced(eb, qg_limit),
                               (long long)
-                              btrfs_qgroup_limit_rsv_exclusive(l, qg_limit));
+                              btrfs_qgroup_limit_rsv_exclusive(eb, qg_limit));
                        break;
+                       }
                case BTRFS_UUID_KEY_SUBVOL:
                case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
-                       print_uuid_item(l, btrfs_item_ptr_offset(l, i),
-                                       btrfs_item_size_nr(l, i));
+                       print_uuid_item(eb, btrfs_item_ptr_offset(eb, i),
+                                       btrfs_item_size_nr(eb, i));
                        break;
-               case BTRFS_STRING_ITEM_KEY:
-                       /* dirty, but it's simple */
-                       str = l->data + btrfs_item_ptr_offset(l, i);
+               case BTRFS_STRING_ITEM_KEY: {
+                       const char *str = eb->data + btrfs_item_ptr_offset(eb, i);
+
                        printf("\t\titem data %.*s\n", item_size, str);
                        break;
+                       }
                case BTRFS_PERSISTENT_ITEM_KEY:
                        printf("\t\tpersistent item objectid ");
                        print_objectid(stdout, objectid, BTRFS_PERSISTENT_ITEM_KEY);
                        printf(" offset %llu\n", (unsigned long long)offset);
                        switch (objectid) {
                        case BTRFS_DEV_STATS_OBJECTID:
-                               print_dev_stats(l, btrfs_item_ptr(l, i,
-                                               struct btrfs_dev_stats_item),
-                                               item_size);
+                               print_dev_stats(eb, ptr, item_size);
                                break;
                        default:
                                printf("\t\tunknown persistent item objectid %llu\n",
@@ -1299,8 +1219,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        printf(" offset %llu\n", (unsigned long long)offset);
                        switch (objectid) {
                        case BTRFS_BALANCE_OBJECTID:
-                               print_balance_item(l, btrfs_item_ptr(l, i,
-                                       struct btrfs_balance_item));
+                               print_balance_item(eb, ptr);
                                break;
                        default:
                                printf("\t\tunknown temporary item objectid %llu\n",
@@ -1314,7 +1233,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
 
 void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int follow)
 {
-       int i;
+       u32 i;
        u32 nr;
        u32 size;
        struct btrfs_disk_key disk_key;