Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / json.c

diff --git a/lib/json.c b/lib/json.c
index 854a3d59d1a86819920ffd91a1a9b325fe7e231c..66312dbc8ddcb4e230c5532a96f13b416859332e 100644 (file)
--- a/lib/json.c
+++ b/lib/json.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* json-c wrapper
  * Copyright (C) 2015 Cumulus Networks, Inc.
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -74,6 +59,19 @@ void json_object_string_addv(struct json_object *obj, const char *key,
        json_object_object_add(obj, key, json_object_new_stringv(fmt, args));
 }
 
+void json_object_object_addv(struct json_object *parent,
+                            struct json_object *child, const char *keyfmt,
+                            va_list args)
+{
+       char *text, buf[256];
+
+       text = vasnprintfrr(MTYPE_TMP, buf, sizeof(buf), keyfmt, args);
+       json_object_object_add(parent, text, child);
+
+       if (text != buf)
+               XFREE(MTYPE_TMP, text);
+}
+
 void json_object_int_add(struct json_object *obj, const char *key, int64_t i)
 {
        json_object_object_add(obj, key, json_object_new_int64(i));