From 2aba8e8914fa7b21e426ab6df1fc23ed684b149f Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 7 Apr 2011 21:02:04 +1000 Subject: [PATCH 07/28] btrfs-progs: cast u64 to long long to avoid printf warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building on ppc64 I hit a number of warnings in printf: btrfs-map-logical.c:69: error: format ‘%Lu’ expects type ‘long long unsigned int’, but argument 4 has type ‘u64’ Fix them. Signed-off-by: Anton Blanchard Signed-off-by: Hugo Mills --- btrfs-list.c | 3 ++- btrfs-map-logical.c | 4 ++-- btrfsctl.c | 2 +- debug-tree.c | 3 ++- disk-io.c | 6 ++++-- extent-tree.c | 3 ++- print-tree.c | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/btrfs-list.c b/btrfs-list.c index abcc2f4..f804dfc 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -249,7 +249,8 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri) break; } } - printf("ID %llu top level %llu path %s\n", ri->root_id, top_id, + printf("ID %llu top level %llu path %s\n", + (unsigned long long)ri->root_id, (unsigned long long)top_id, full_path); free(full_path); return 0; diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index 678ff36..6d3ef7a 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -63,8 +63,8 @@ struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr, eb->dev_bytenr = multi->stripes[0].physical; fprintf(info_file, "mirror %d logical %Lu physical %Lu " - "device %s\n", mirror_num, bytenr, eb->dev_bytenr, - device->name); + "device %s\n", mirror_num, (unsigned long long)bytenr, + (unsigned long long)eb->dev_bytenr, device->name); kfree(multi); if (!copy || mirror_num == copy) diff --git a/btrfsctl.c b/btrfsctl.c index 73e20ec..d45e2a7 100644 --- a/btrfsctl.c +++ b/btrfsctl.c @@ -250,7 +250,7 @@ int main(int ac, char **av) args.fd = fd; ret = ioctl(snap_fd, command, &args); } else if (command == BTRFS_IOC_DEFAULT_SUBVOL) { - printf("objectid is %llu\n", objectid); + printf("objectid is %llu\n", (unsigned long long)objectid); ret = ioctl(fd, command, &objectid); } else ret = ioctl(fd, command, &args); diff --git a/debug-tree.c b/debug-tree.c index d21a8bd..34cefe9 100644 --- a/debug-tree.c +++ b/debug-tree.c @@ -125,7 +125,8 @@ int main(int ac, char **av) root->nodesize, 0); } if (!leaf) { - fprintf(stderr, "failed to read %llu\n", block_only); + fprintf(stderr, "failed to read %llu\n", + (unsigned long long)block_only); return 0; } btrfs_print_tree(root, leaf, 0); diff --git a/disk-io.c b/disk-io.c index a57cb38..8b2133b 100644 --- a/disk-io.c +++ b/disk-io.c @@ -674,7 +674,8 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { printk("couldn't open because of unsupported " - "option features (%Lx).\n", features); + "option features (%Lx).\n", + (unsigned long long)features); BUG_ON(1); } @@ -688,7 +689,8 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, ~BTRFS_FEATURE_COMPAT_RO_SUPP; if (writes && features) { printk("couldn't open RDWR because of unsupported " - "option features (%Lx).\n", features); + "option features (%Lx).\n", + (unsigned long long)features); BUG_ON(1); } diff --git a/extent-tree.c b/extent-tree.c index d550854..1c606c9 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1448,7 +1448,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, goto out; if (ret != 0) { btrfs_print_leaf(root, path->nodes[0]); - printk("failed to find block number %Lu\n", bytenr); + printk("failed to find block number %Lu\n", + (unsigned long long)bytenr); BUG(); } diff --git a/print-tree.c b/print-tree.c index ddcade1..59c23c5 100644 --- a/print-tree.c +++ b/print-tree.c @@ -496,7 +496,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l) case BTRFS_DIR_LOG_ITEM_KEY: dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item); printf("\t\tdir log end %Lu\n", - btrfs_dir_log_end(l, dlog)); + (unsigned long long)btrfs_dir_log_end(l, dlog)); break; case BTRFS_ORPHAN_ITEM_KEY: printf("\t\torphan item\n"); -- 1.7.5.2.353.g5df3e