X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzdb%2Fzdb.c;h=012d009dc3c855a09d494007575ae6870725c7f7;hb=0ccd9d24e4fdbe9cd07f838d0a62083e8eca95f2;hp=45b27b0a450048130da9926baa24a2a249fecc37;hpb=d6320ddb78fa89c4d0fc2af00ae53c7c70992f96;p=zfs.git

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 45b27b0..012d009 100644
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -874,8 +874,8 @@ dump_history(spa_t *spa)
 			(void) snprintf(internalstr,
 			    sizeof (internalstr),
 			    "[internal %s txg:%lld] %s",
-			    zfs_history_event_names[ievent], txg,
-			    intstr);
+			    zfs_history_event_names[ievent],
+			    (longlong_t)txg, intstr);
 			cmd = internalstr;
 		}
 		tsec = time;
@@ -1668,7 +1668,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);
@@ -1680,7 +1680,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
@@ -2554,7 +2554,7 @@ zdb_dump_block_raw(void *buf, uint64_t size, int flags)
 {
 	if (flags & ZDB_FLAG_BSWAP)
 		byteswap_uint64_array(buf, size);
-	(void) write(1, buf, size);
+	VERIFY(write(fileno(stdout), buf, size) == size);
 }
 
 static void