Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OS-5074 want nvlist_print_json_pretty #212

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion usr/src/lib/libnvpair/libnvpair.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
* Copyright (c) 2017, Joyent, Inc.
*/

#ifndef _LIBNVPAIR_H
Expand Down Expand Up @@ -48,8 +48,10 @@ extern int nvpair_value_match_regex(nvpair_t *, int, char *, regex_t *,

extern void nvlist_print(FILE *, nvlist_t *);
extern int nvlist_print_json(FILE *, nvlist_t *);
extern int nvlist_print_json_pretty(FILE *, nvlist_t *, char *);
extern void dump_nvlist(nvlist_t *, int);
extern int nvlist_dump_json(nvlist_t *, char **);
extern int nvlist_dump_json_pretty(nvlist_t *, char **, char *);
extern void nvlist_dump_json_free(nvlist_t *, char *);

/*
Expand Down
4 changes: 3 additions & 1 deletion usr/src/lib/libnvpair/mapfile-vers
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2013, Joyent, Inc. All rights reserved.
# Copyright (c) 2017, Joyent, Inc.
#

#
Expand Down Expand Up @@ -245,9 +245,11 @@ SYMBOL_VERSION SUNWprivate_1.1 {
nvlist_add_hrtime;
nvlist_lookup_hrtime;
nvlist_dump_json;
nvlist_dump_json_pretty;
nvlist_dump_json_free;
nvlist_print;
nvlist_print_json;
nvlist_print_json_pretty;
nvlist_prt;
nvlist_prtctl_alloc;
nvlist_prtctl_free;
Expand Down
Loading