X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=lib%2Flibnvpair%2Flibnvpair.c;h=b852cb6170b15ae9b3eb3632c61c8452729062a5;hb=6e1d7276c94cbd7c2e19f9232f6ba4bafa62dbe0;hp=f669f9a893bf77a862fcc1fc4d3126f8bf5da11b;hpb=b8864a233c569edcc57c686f3ea8cd1ae3b89153;p=zfs.git

diff --git a/lib/libnvpair/libnvpair.c b/lib/libnvpair/libnvpair.c
index f669f9a..b852cb6 100644
--- a/lib/libnvpair/libnvpair.c
+++ b/lib/libnvpair/libnvpair.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <unistd.h>
@@ -123,7 +124,7 @@ struct nvlist_prtctl {
 			(void) DFLTPRTOP(pctl, type)(pctl, \
 			    DFLTPRTOPARG(pctl, type), nvl, name, val); \
 		} \
-		(void) fprintf(pctl->nvprt_fp, pctl->nvprt_eomfmt); \
+		(void) fprintf(pctl->nvprt_fp, "%s", pctl->nvprt_eomfmt); \
 	}
 
 #define	ARENDER(pctl, type, nvl, name, arrp, count) \
@@ -137,7 +138,7 @@ struct nvlist_prtctl {
 			(void) DFLTPRTOP(pctl, type)(pctl, \
 			    DFLTPRTOPARG(pctl, type), nvl, name, arrp, count); \
 		} \
-		(void) fprintf(pctl->nvprt_fp, pctl->nvprt_eomfmt); \
+		(void) fprintf(pctl->nvprt_fp, "%s", pctl->nvprt_eomfmt); \
 	}
 
 static void nvlist_print_with_indent(nvlist_t *, nvlist_prtctl_t);
@@ -235,7 +236,7 @@ nvaprint_##type_and_variant(nvlist_prtctl_t pctl, void *private, \
 				(void) fprintf(fp, "[%d]: ", i); \
 		} \
 		if (i != 0) \
-			(void) fprintf(fp, pctl->nvprt_btwnarrfmt); \
+			(void) fprintf(fp, "%s", pctl->nvprt_btwnarrfmt); \
 		(void) fprintf(fp, vfmt, (ptype)valuep[i]); \
 	} \
 	return (1); \
@@ -394,11 +395,11 @@ nvlist_prtctl_dofmt(nvlist_prtctl_t pctl, enum nvlist_prtctl_fmt which, ...)
 		break;
 
 	case NVLIST_FMT_MEMBER_POSTAMBLE:
-		(void) fprintf(fp, pctl->nvprt_eomfmt);
+		(void) fprintf(fp, "%s", pctl->nvprt_eomfmt);
 		break;
 
 	case NVLIST_FMT_BTWN_ARRAY:
-		(void) fprintf(fp, pctl->nvprt_btwnarrfmt); \
+		(void) fprintf(fp, "%s", pctl->nvprt_btwnarrfmt);
 		break;
 
 	default:
@@ -803,6 +804,10 @@ dump_nvlist(nvlist_t *list, int indent)
 
 	while ((elem = nvlist_next_nvpair(list, elem)) != NULL) {
 		switch (nvpair_type(elem)) {
+		case DATA_TYPE_BOOLEAN:
+			(void) printf("%*s%s\n", indent, "", nvpair_name(elem));
+			break;
+
 		case DATA_TYPE_BOOLEAN_VALUE:
 			(void) nvpair_value_boolean_value(elem, &bool_value);
 			(void) printf("%*s%s: %s\n", indent, "",