svn commit: r324222 - head/cddl/contrib/opensolaris/cmd/zdb

[Alan Somers]

Author: asomers
Date: Mon Oct  2 22:35:35 2017
New Revision: 324222
URL: https://svnweb.freebsd.org/changeset/base/324222

Log:
  MFV r316863: 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>
  
  MFC after:	3 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/cmd/zdb/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct  2 22:13:20 2017	(r324221)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct  2 22:35:35 2017	(r324222)
@@ -1587,8 +1587,9 @@ 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 -> "
-			    "obj %llu", (longlong_t)dle->dle_mintxg,
+			(void) snprintf(buf, sizeof (buf),
+			    "mintxg %llu -> obj %llu",
+			    (longlong_t)dle->dle_mintxg,
 			    (longlong_t)dle->dle_bpobj.bpo_object);
 			dump_full_bpobj(&dle->dle_bpobj, buf, 0);
 		} else {