From 55344474772b79ba53006b3cca25a3075c3c3e56 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 8 Jul 2009 09:06:03 -0700 Subject: [PATCH 1/2] Add explicit casts for (u_longlong_t) when printing uint64_t. --- cmd/zfs/zfs_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index fe0ca75985..0bc86f84ba 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -2389,7 +2389,7 @@ zfs_do_set(int argc, char **argv) usage(B_FALSE); } - ret = zfs_for_each(argc - 2, argv + 2, NULL, + ret = zfs_for_each(argc - 2, argv + 2, 0, ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb); return (ret); From b2e459dab08d702888324f2f8841b628ff0b80f1 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 8 Jul 2009 09:07:13 -0700 Subject: [PATCH 2/2] Add explicit casts for (u_longlong_t) when printing uint64_t. --- cmd/ztest/ztest.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 746db0c070..ad8d47fbc1 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -1608,11 +1608,16 @@ ztest_dsl_dataset_cleanup(char *osname, uint64_t curval) char snap3name[100]; int error; - (void) snprintf(snap1name, 100, "%s@s1_%llu", osname, curval); - (void) snprintf(clone1name, 100, "%s/c1_%llu", osname, curval); - (void) snprintf(snap2name, 100, "%s@s2_%llu", clone1name, curval); - (void) snprintf(clone2name, 100, "%s/c2_%llu", osname, curval); - (void) snprintf(snap3name, 100, "%s@s3_%llu", clone1name, curval); + (void) snprintf(snap1name, 100, "%s@s1_%llu", + osname, (u_longlong_t)curval); + (void) snprintf(clone1name, 100, "%s/c1_%llu", + osname, (u_longlong_t)curval); + (void) snprintf(snap2name, 100, "%s@s2_%llu", + clone1name, (u_longlong_t)curval); + (void) snprintf(clone2name, 100, "%s/c2_%llu", + osname, (u_longlong_t)curval); + (void) snprintf(snap3name, 100, "%s@s3_%llu", + clone1name, (u_longlong_t)curval); error = dmu_objset_destroy(clone2name); if (error && error != ENOENT) @@ -1654,11 +1659,16 @@ ztest_dsl_dataset_promote_busy(ztest_args_t *za) dmu_objset_name(os, osname); ztest_dsl_dataset_cleanup(osname, curval); - (void) snprintf(snap1name, 100, "%s@s1_%llu", osname, curval); - (void) snprintf(clone1name, 100, "%s/c1_%llu", osname, curval); - (void) snprintf(snap2name, 100, "%s@s2_%llu", clone1name, curval); - (void) snprintf(clone2name, 100, "%s/c2_%llu", osname, curval); - (void) snprintf(snap3name, 100, "%s@s3_%llu", clone1name, curval); + (void) snprintf(snap1name, 100, "%s@s1_%llu", + osname, (u_longlong_t)curval); + (void) snprintf(clone1name, 100, "%s/c1_%llu", + osname, (u_longlong_t)curval); + (void) snprintf(snap2name, 100, "%s@s2_%llu", + clone1name, (u_longlong_t)curval); + (void) snprintf(clone2name, 100, "%s/c2_%llu", + osname, (u_longlong_t)curval); + (void) snprintf(snap3name, 100, "%s@s3_%llu", + clone1name, (u_longlong_t)curval); error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1, NULL, FALSE);