Date: Fri, 5 Dec 2014 23:43:15 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r275532 - vendor/illumos/dist/lib/libnvpair Message-ID: <201412052343.sB5NhFmH013541@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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@joyent.com> Approved by: Gordon Ross <gwr@nexenta.com> Author: Joshua M. Clulow <josh@sysmgr.org> illumos/illumos-gate@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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412052343.sB5NhFmH013541>