svn commit: r275532 - vendor/illumos/dist/lib/libnvpair

[Xin LI]

Author: delphij
Date: Fri Dec  5 23:43:15 2014
New Revision: 275532
URL: https://svnweb.freebsd.org/changeset/base/275532

Log:
  5005 libnvpair JSON output broken by lint fixes
  5006 libnvpair JSON cannot print int16 arrays
  Reviewed by: Robert Mustacchi <rm at joyent.com>
  Approved by: Gordon Ross <gwr at nexenta.com>
  Author: Joshua M. Clulow <josh at sysmgr.org>
  
  illumos/illumos-gate at 37c79205ad46187f54b2edbf6a468160935f14d9

Modified:
  vendor/illumos/dist/lib/libnvpair/nvpair_json.c

Modified: vendor/illumos/dist/lib/libnvpair/nvpair_json.c
==============================================================================
--- vendor/illumos/dist/lib/libnvpair/nvpair_json.c	Fri Dec  5 23:08:39 2014	(r275531)
+++ vendor/illumos/dist/lib/libnvpair/nvpair_json.c	Fri Dec  5 23:43:15 2014	(r275532)
@@ -9,7 +9,7 @@
  * http://www.illumos.org/license/CDDL.
  */
 /*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2014, Joyent, Inc.
  */
 
 #include <stdio.h>
@@ -20,9 +20,11 @@
 
 #include "libnvpair.h"
 
-#define	FPRINTF(fp, ...)			\
-	if (fprintf(fp, __VA_ARGS__) < 0)	\
-		return (-1)			\
+#define	FPRINTF(fp, ...)				\
+	do {						\
+		if (fprintf(fp, __VA_ARGS__) < 0)	\
+			return (-1);			\
+	} while (0)
 
 /*
  * When formatting a string for JSON output we must escape certain characters,
@@ -328,7 +330,7 @@ nvlist_print_json(FILE *fp, nvlist_t *nv
 			for (i = 0; i < valsz; i++) {
 				if (i > 0)
 					FPRINTF(fp, ",");
-				FPRINTF(fp, "%hhd", val[i]);
+				FPRINTF(fp, "%hd", val[i]);
 			}
 			FPRINTF(fp, "]");
 			break;