5005 libnvpair JSON output broken by lint fixes
5006 libnvpair JSON cannot print int16 arrays
Reviewed by: Robert Mustacchi <rm@joyent.com>

          --- old/usr/src/lib/libnvpair/Makefile.com
          +++ new/usr/src/lib/libnvpair/Makefile.com

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the

  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright (c) 2012 by Delphix. All rights reserved.
  26      -# Copyright (c) 2013, Joyent, Inc. All rights reserved.
       26 +# Copyright (c) 2014, Joyent, Inc. All rights reserved.
  27   27  #
  28   28  
  29   29  LIBRARY=        libnvpair.a
  30   30  VERS=           .1
  31   31  
  32   32  OBJECTS=        libnvpair.o \
  33   33                  nvpair_alloc_system.o \
  34   34                  nvpair_alloc_fixed.o \
  35   35                  nvpair.o \
  36   36                  fnvpair.o \

  37   37                  nvpair_json.o
  38   38  
  39   39  include ../../Makefile.lib
  40   40  include ../../Makefile.rootfs
  41   41  
  42   42  SRCS=           ../libnvpair.c \
  43   43                  ../nvpair_alloc_system.c \
  44   44                  ../nvpair_json.c \
  45   45                  $(SRC)/common/nvpair/nvpair_alloc_fixed.c \
  46   46                  $(SRC)/common/nvpair/nvpair.c \
  47   47                  $(SRC)/common/nvpair/fnvpair.c
  48   48  
  49   49  #
  50   50  # Libraries added to the next line must be present in miniroot
  51   51  #
  52   52  LDLIBS +=       -lc -lnsl

  53   53  LIBS =          $(DYNLIB) $(LINTLIB)
  54   54  
  55   55  # turn off ptr-cast warnings
  56   56  LINTFLAGS64 +=  -erroff=E_BAD_PTR_CAST_ALIGN
  57   57  
  58   58  # turn off warning caused by lint bug: not understanding SCNi8 "hhi"
  59   59  LINTFLAGS +=    -erroff=E_BAD_FORMAT_STR2
  60   60  LINTFLAGS +=    -erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO
  61   61  LINTFLAGS +=    -erroff=E_RET_INT_IMPLICITLY
  62   62  LINTFLAGS +=    -erroff=E_FUNC_USED_VAR_ARG2
       63 +LINTFLAGS +=    -erroff=E_CONSTANT_CONDITION
  63   64  LINTFLAGS64 +=  -erroff=E_BAD_FORMAT_STR2
  64   65  LINTFLAGS64 +=  -erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO
  65   66  LINTFLAGS64 +=  -erroff=E_RET_INT_IMPLICITLY
  66   67  LINTFLAGS64 +=  -erroff=E_FUNC_USED_VAR_ARG2
       68 +LINTFLAGS64 +=  -erroff=E_CONSTANT_CONDITION
  67   69  
  68   70  CERRWARN +=     -_gcc=-Wno-type-limits
  69   71  CERRWARN +=     -_gcc=-Wno-parentheses
  70   72  CERRWARN +=     -_gcc=-Wno-uninitialized
  71   73  
  72   74  CFLAGS +=       $(CCVERBOSE)
  73   75  CPPFLAGS +=     -D_REENTRANT
  74   76  
  75   77  C99MODE=        -xc99=%all
  76   78  C99LMODE=       -Xc99=%all

  77   79  
  78   80  $(LINTLIB) :=   SRCS = $(SRCDIR)/$(LINTSRC)
  79   81  
  80   82  .KEEP_STATE:
  81   83  
  82   84  all: $(LIBS)
  83   85  
  84   86  lint: lintcheck
  85   87  
  86   88  include ../../Makefile.targ
  87   89  
  88   90  pics/%.o: $(SRC)/common/nvpair/%.c
  89   91          $(COMPILE.c) -o $@ $<
  90   92          $(POST_PROCESS_O)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX