svn commit: r316863 - vendor/illumos/dist/cmd/zdb

[Andriy Gapon]

Author: avg
Date: Fri Apr 14 16:59:53 2017
New Revision: 316863
URL: https://svnweb.freebsd.org/changeset/base/316863

Log:
  3871 fix issues introduced by 3604
  
  illumos/illumos-gate at de05b58863498b10283637eb9ac85e92fe85150e
  https://github.com/illumos/illumos-gate/commit/de05b58863498b10283637eb9ac85e92fe85150e
  
  https://www.illumos.org/issues/3871
    GCC 4.5.3 on Gentoo Linux did not like a few of the changes made in the issue
    3604 patch. It printed an error and a couple of warnings:
    ../../cmd/zdb/zdb.c: In function 'dump_bpobj':
    ../../cmd/zdb/zdb.c:1257:3: error: 'for' loop initial declarations are only
    allowed in C99 mode
    ../../cmd/zdb/zdb.c:1257:3: note: use option -std=c99 or -std=gnu99 to compile
    your code
    ../../cmd/zdb/zdb.c: In function 'dump_deadlist':
    ../../cmd/zdb/zdb.c:1323:8: warning: too many arguments for format
    ../../cmd/zdb/zdb.c:1323:8: warning: too many arguments for format
  
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Serapheim Dimitropoulos <serapheim at delphix.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Richard Yao <ryao at gentoo.org>

Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Fri Apr 14 16:58:41 2017	(r316862)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Fri Apr 14 16:59:53 2017	(r316863)
@@ -1564,7 +1564,8 @@ dump_deadlist(dsl_deadlist_t *dl)
 	    dle = AVL_NEXT(&dl->dl_tree, dle)) {
 		if (dump_opt['d'] >= 5) {
 			char buf[128];
-			(void) snprintf(buf, sizeof (buf), "mintxg %llu -> ",
+			(void) snprintf(buf, sizeof (buf),
+			    "mintxg %llu -> obj %llu",
 			    (longlong_t)dle->dle_mintxg,
 			    (longlong_t)dle->dle_bpobj.bpo_object);