d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5005 libnvpair JSON output broken by lint fixes

Browse Source 
5006 libnvpair JSON cannot print int16 arrays
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Author: Joshua M. Clulow <josh@sysmgr.org>

illumos/illumos-gate@37c79205ad
This commit is contained in:
Xin LI 2014-12-05 23:43:15 +00:00
parent 0945ce02d2
commit 83f1ce8ea7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libnvpair/nvpair_json.c
View File

@ -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 *nvl)
for (i = 0; i < valsz; i++) {
if (i > 0)
FPRINTF(fp, ",");
FPRINTF(fp, "%hhd", val[i]);
FPRINTF(fp, "%hd", val[i]);
}
FPRINTF(fp, "]");
break;