Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

This commit is contained in:
Brian Behlendorf 2010-07-12 10:23:25 -07:00
commit d1f7e73bd0
1 changed files with 2 additions and 2 deletions

View File

@ -1664,7 +1664,7 @@ dump_uberblock(uberblock_t *ub, const char *header, const char *footer)
{
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("\tversion = %llu\n", (u_longlong_t)ub->ub_version);
(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);
(void) printf("\trootbp = %s\n", blkbuf);
}
(void) printf(footer ? footer : "");
(void) printf("%s", footer ? footer : "");
}
static void