Print this page
OS-1840 fmdump shall emit JSON (copyright fixes 2)
OS-1840 fmdump shall emit JSON (rm feedback)

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/nvpair.h
          +++ new/usr/src/uts/common/sys/nvpair.h
↓ open down ↓ 13 lines elided ↑ open up ↑
  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 (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   * Copyright (c) 2012 by Delphix. All rights reserved.
       24 + * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  24   25   */
  25   26  
  26   27  #ifndef _SYS_NVPAIR_H
  27   28  #define _SYS_NVPAIR_H
  28   29  
  29   30  #include <sys/types.h>
  30   31  #include <sys/time.h>
  31   32  #include <sys/errno.h>
  32   33  #include <sys/va_list.h>
  33   34  
↓ open down ↓ 282 lines elided ↑ open up ↑
 316  317  void fnvlist_remove_nvpair(nvlist_t *, nvpair_t *);
 317  318  
 318  319  nvpair_t *fnvlist_lookup_nvpair(nvlist_t *nvl, const char *name);
 319  320  boolean_t fnvlist_lookup_boolean(nvlist_t *nvl, const char *name);
 320  321  boolean_t fnvlist_lookup_boolean_value(nvlist_t *nvl, const char *name);
 321  322  uchar_t fnvlist_lookup_byte(nvlist_t *nvl, const char *name);
 322  323  int8_t fnvlist_lookup_int8(nvlist_t *nvl, const char *name);
 323  324  int16_t fnvlist_lookup_int16(nvlist_t *nvl, const char *name);
 324  325  int32_t fnvlist_lookup_int32(nvlist_t *nvl, const char *name);
 325  326  int64_t fnvlist_lookup_int64(nvlist_t *nvl, const char *name);
 326      -uint8_t fnvlist_lookup_uint8_t(nvlist_t *nvl, const char *name);
      327 +uint8_t fnvlist_lookup_uint8(nvlist_t *nvl, const char *name);
 327  328  uint16_t fnvlist_lookup_uint16(nvlist_t *nvl, const char *name);
 328  329  uint32_t fnvlist_lookup_uint32(nvlist_t *nvl, const char *name);
 329  330  uint64_t fnvlist_lookup_uint64(nvlist_t *nvl, const char *name);
 330  331  char *fnvlist_lookup_string(nvlist_t *nvl, const char *name);
 331  332  nvlist_t *fnvlist_lookup_nvlist(nvlist_t *nvl, const char *name);
 332  333  
 333  334  boolean_t fnvpair_value_boolean_value(nvpair_t *nvp);
 334  335  uchar_t fnvpair_value_byte(nvpair_t *nvp);
 335  336  int8_t fnvpair_value_int8(nvpair_t *nvp);
 336  337  int16_t fnvpair_value_int16(nvpair_t *nvp);
 337  338  int32_t fnvpair_value_int32(nvpair_t *nvp);
 338  339  int64_t fnvpair_value_int64(nvpair_t *nvp);
 339      -uint8_t fnvpair_value_uint8_t(nvpair_t *nvp);
      340 +uint8_t fnvpair_value_uint8(nvpair_t *nvp);
 340  341  uint16_t fnvpair_value_uint16(nvpair_t *nvp);
 341  342  uint32_t fnvpair_value_uint32(nvpair_t *nvp);
 342  343  uint64_t fnvpair_value_uint64(nvpair_t *nvp);
 343  344  char *fnvpair_value_string(nvpair_t *nvp);
 344  345  nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp);
      346 +hrtime_t fnvpair_value_hrtime(nvpair_t *);
      347 +#if !defined(_KERNEL)
      348 +double fnvpair_value_double(nvpair_t *);
      349 +#endif
 345  350  
 346  351  #ifdef  __cplusplus
 347  352  }
 348  353  #endif
 349  354  
 350  355  #endif  /* _SYS_NVPAIR_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX