Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2010-07-12 10:23:43 -07:00
parent ea39046f41 99694a2e81
commit 11f7277f9f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zdb/zdb.c
View File

@ -1664,7 +1664,7 @@ dump_uberblock(uberblock_t *ub, const char *header, const char *footer)
{ {
time_t timestamp = ub->ub_timestamp; time_t timestamp = ub->ub_timestamp;
(void) printf(header ? header : ""); (void) printf("%s", header ? header : "");
(void) printf("\tmagic = %016llx\n", (u_longlong_t)ub->ub_magic); (void) printf("\tmagic = %016llx\n", (u_longlong_t)ub->ub_magic);
(void) printf("\tversion = %llu\n", (u_longlong_t)ub->ub_version); (void) printf("\tversion = %llu\n", (u_longlong_t)ub->ub_version);
(void) printf("\ttxg = %llu\n", (u_longlong_t)ub->ub_txg); (void) printf("\ttxg = %llu\n", (u_longlong_t)ub->ub_txg);
@ -1676,7 +1676,7 @@ dump_uberblock(uberblock_t *ub, const char *header, const char *footer)
sprintf_blkptr(blkbuf, &ub->ub_rootbp); sprintf_blkptr(blkbuf, &ub->ub_rootbp);
(void) printf("\trootbp = %s\n", blkbuf); (void) printf("\trootbp = %s\n", blkbuf);
} }
(void) printf(footer ? footer : ""); (void) printf("%s", footer ? footer : "");
} }
static void static void