diff --git a/include/sys/jprint.h b/include/sys/jprint.h index e2a114ff6c..37592e1caa 100644 --- a/include/sys/jprint.h +++ b/include/sys/jprint.h @@ -17,7 +17,7 @@ /* #include */ /* maximum stack nesting */ -#define JP_MAX_STACK 32 +#define JP_MAX_STACK 32 enum jp_type { JP_OBJECT = 1, @@ -30,26 +30,26 @@ struct jp_stack { }; typedef struct jprint { - char *buffer; /* pointer to application's buffer */ - size_t buflen; /* length of buffer */ - char *bufp; /* current write position in buffer */ - char tmpbuf[32]; /* local buffer for conversions */ - int error; /* error code */ - int ncall; /* API call number on which error occurred */ - struct jp_stack /* stack of array/object nodes */ + char *buffer; /* pointer to application's buffer */ + size_t buflen; /* length of buffer */ + char *bufp; /* current write position in buffer */ + char tmpbuf[32]; /* local buffer for conversions */ + int error; /* error code */ + int ncall; /* API call number on which error occurred */ + struct jp_stack /* stack of array/object nodes */ stack[JP_MAX_STACK]; int stackp; } jprint_t; /* error return codes */ -#define JPRINT_OK 0 /* no error */ -#define JPRINT_BUF_FULL 1 /* output buffer full */ -#define JPRINT_NEST_ERROR 2 /* nesting error */ -#define JPRINT_STACK_FULL 3 /* array/object nesting */ -#define JPRINT_STACK_EMPTY 4 /* stack underflow error */ -#define JPRINT_OPEN 5 /* not all objects closed */ -#define JPRINT_FMT 6 /* format error */ -#define JPRINT_NO_DOUBLE 7 /* %g support not included */ +#define JPRINT_OK 0 /* no error */ +#define JPRINT_BUF_FULL 1 /* output buffer full */ +#define JPRINT_NEST_ERROR 2 /* nesting error */ +#define JPRINT_STACK_FULL 3 /* array/object nesting */ +#define JPRINT_STACK_EMPTY 4 /* stack underflow error */ +#define JPRINT_OPEN 5 /* not all objects closed */ +#define JPRINT_FMT 6 /* format error */ +#define JPRINT_NO_DOUBLE 7 /* %g support not included */ const char *jp_errorstring(int err); int jp_error(jprint_t *jp); @@ -57,4 +57,3 @@ void jp_open(jprint_t *jp, char *buffer, size_t buflen); int jp_close(jprint_t *jp); int jp_errorpos(jprint_t *jp); int jp_printf(jprint_t *jp, const char *fmt, ...); - diff --git a/include/sys/json_stats.h b/include/sys/json_stats.h index ae47fe91ba..0a9cb50e59 100644 --- a/include/sys/json_stats.h +++ b/include/sys/json_stats.h @@ -4,4 +4,3 @@ void json_stats_destroy(spa_t *spa); void json_stats_init(spa_t *spa); - diff --git a/module/zfs/jprint.c b/module/zfs/jprint.c index 7136ac0909..7cc42d35c2 100644 --- a/module/zfs/jprint.c +++ b/module/zfs/jprint.c @@ -10,19 +10,19 @@ /* #include "jprint.h" */ /* Do not support %g format. Just %d and %l for integers (if set) */ -#define NO_DOUBLE 1 +#define NO_DOUBLE 1 /* Use %g instead of %e for double format */ -#define USE_G 1 +#define USE_G 1 /* Formats for int64_t and uint64_t */ #ifndef PRId64 -#define PRId64 "lld" /* %D, int64_t */ -#define PRIu64 "llu" /* %U, uint64_t*/ +#define PRId64 "lld" /* %D, int64_t */ +#define PRIu64 "llu" /* %U, uint64_t */ #endif /* literal key length maximum */ -#define KEYLEN 255 +#define KEYLEN 5 /* return error position (call number of jp_printf) */ int @@ -36,17 +36,17 @@ const char * jp_errorstring(int err) { switch (err) { - case JPRINT_OK: return "jprint ok"; - case JPRINT_BUF_FULL: return "jprint buffer full"; - case JPRINT_NEST_ERROR: return "jprint nest error"; - case JPRINT_STACK_FULL: return "jprint stack full"; - case JPRINT_STACK_EMPTY: return "jprint stack empty"; - case JPRINT_OPEN: return "jprint open"; - case JPRINT_FMT: return "jprint format"; - case JPRINT_NO_DOUBLE: return "jprint no double support"; - default: return "jprint unknown error"; + case JPRINT_OK: return "jprint ok"; + case JPRINT_BUF_FULL: return "jprint buffer full"; + case JPRINT_NEST_ERROR: return "jprint nest error"; + case JPRINT_STACK_FULL: return "jprint stack full"; + case JPRINT_STACK_EMPTY: return "jprint stack empty"; + case JPRINT_OPEN: return "jprint open"; + case JPRINT_FMT: return "jprint format"; + case JPRINT_NO_DOUBLE: return "jprint no double support"; + default: return "jprint unknown error"; } - return "jprint unknown error"; + return ("jprint unknown error"); } /* return error from jprint_t */ @@ -74,7 +74,7 @@ int jp_close(jprint_t *jp) { if (jp->error != JPRINT_OK) - return (jp->error); + return (jp->error); if (jp->stackp != -1) jp->error = JPRINT_OPEN; return (jp->error); @@ -118,51 +118,51 @@ jp_putsq(jprint_t *jp, char *s) } jp_putc(jp, '\"'); while (*s && (jp->error == JPRINT_OK)) { - c = (int)*s++; - /* formfeed, newline, return, tab, backspace */ - if (c == 12) - jp_puts(jp, (char *)"\\f"); - else if (c == 10) - jp_puts(jp, (char *)"\\n"); - else if (c == 13) - jp_puts(jp, (char *)"\\r"); - else if (c == 9) - jp_puts(jp, (char *)"\\t"); - else if (c == 8) - jp_puts(jp, (char *)"\\b"); - /* - * all characters from 0x00 to 0x1f, and 0x7f are - * escaped as: \u00xx - */ - else if (((0 <= c) && (c <= 0x1f)) || (c == 0x7f)) { - jp_puts(jp, (char *)"\\u00"); - jp_putc(jp, hex[(c >> 4) & 0x0f]); - jp_putc(jp, hex[c & 0x0f]); - /* * " \ / */ - } else if (c == '"') - jp_puts(jp, (char *)"\\\""); - else if (c == '\\') - jp_puts(jp, (char *)"\\\\"); - else if (c == '/') - jp_puts(jp, (char *)"\\/"); - /* + c = (int)*s++; + /* formfeed, newline, return, tab, backspace */ + if (c == 12) + jp_puts(jp, (char *)"\\f"); + else if (c == 10) + jp_puts(jp, (char *)"\\n"); + else if (c == 13) + jp_puts(jp, (char *)"\\r"); + else if (c == 9) + jp_puts(jp, (char *)"\\t"); + else if (c == 8) + jp_puts(jp, (char *)"\\b"); + /* + * all characters from 0x00 to 0x1f, and 0x7f are + * escaped as: \u00xx + */ + else if (((0 <= c) && (c <= 0x1f)) || (c == 0x7f)) { + jp_puts(jp, (char *)"\\u00"); + jp_putc(jp, hex[(c >> 4) & 0x0f]); + jp_putc(jp, hex[c & 0x0f]); + /* * " \ / */ + } else if (c == '"') + jp_puts(jp, (char *)"\\\""); + else if (c == '\\') + jp_puts(jp, (char *)"\\\\"); + else if (c == '/') + jp_puts(jp, (char *)"\\/"); + /* * all other printable characters ' ' to '~', and - * any utf-8 sequences (high bit set): - * 1xxxxxxx 10xxxxxx ... - * is a utf-8 sequence (10xxxxxx may occur 1 to 3 times). - * Note that this is simply distinguished here as high - * bit set. - */ - else + * any utf-8 sequences (high bit set): + * 1xxxxxxx 10xxxxxx ... + * is a utf-8 sequence (10xxxxxx may occur 1 to 3 times). + * Note that this is simply distinguished here as high + * bit set. + */ + else jp_putc(jp, (char)c); - } + } jp_putc(jp, '\"'); } /* put out key if object open. error if nothing open */ static int -jp_key(jprint_t *jp, char *key) +jp_key(jprint_t *jp, char *key) { if (jp->error != JPRINT_OK) goto err; @@ -323,7 +323,7 @@ jp_printf(jprint_t *jp, const char *fmt, ...) */ i = snprintf( jp->tmpbuf, sizeof (jp->tmpbuf), - "%g", x); + "%g", x); #else /* * double has 15 places: @@ -331,7 +331,7 @@ jp_printf(jprint_t *jp, const char *fmt, ...) */ i = snprintf( jp->tmpbuf, sizeof (jp->tmpbuf), - "%21.14e", x); + "%21.14e", x); #endif if ((i >= sizeof (jp->tmpbuf)) || (i < 0)) @@ -349,8 +349,9 @@ jp_printf(jprint_t *jp, const char *fmt, ...) } if (jp_key(jp, key) == JPRINT_OK) { b = (boolean_t)va_arg(ap, int); - s = b ? (char *)"true" : - (char *)"false"; + s = b ? + (char *)"true" : + (char *)"false"; jp_puts(jp, s); } key[k = 0] = '\0'; @@ -440,7 +441,6 @@ jp_printf(jprint_t *jp, const char *fmt, ...) va_end(ap); if (jp->error != JPRINT_OK) return (-1); - + return (int)(jp->bufp - start); } - diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index babca95744..3119a991f1 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -1598,7 +1598,9 @@ zfs_ioc_pool_configs(zfs_cmd_t *zc) int error; if (fmgw_debug != 0) - zfs_dbgmsg("fmgw -- calling spa_all_configs, which takes spa_namespace_lock"); + zfs_dbgmsg( + "fmgw -- calling spa_all_configs," + "which takes spa_namespace_lock"); if ((configs = spa_all_configs(&zc->zc_cookie)) == NULL) return (SET_ERROR(EEXIST)); @@ -7475,8 +7477,6 @@ zfsdev_ioctl_common(uint_t vecnum, zfs_cmd_t *zc, int flag) if (vec->zvec_func == NULL && vec->zvec_legacy_func == NULL) return (SET_ERROR(ZFS_ERR_IOC_CMD_UNAVAIL)); -// if (fmgw_debug != 0) -// zfs_dbgmsg("enter ioctl, %d %x %s", vecnum, vecnum, fmgw_zioctl(vecnum + ZFS_IOC_FIRST)); zc->zc_iflags = flag & FKIOCTL; max_nvlist_src_size = zfs_max_nvlist_src_size_os(); if (zc->zc_nvlist_src_size > max_nvlist_src_size) {