libnm: rename variables that clash with jansson symbolsth/libnm_janssonth/libnm-jansson

libjansson names symbols json_*, we should not use this namespace for our
local variables. Rename them to js_*.

However, don't rename "json", and "json1", and they don't clash.

1 files changed, 142 insertions, 142 deletions

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index a65cb92405..bf0aebaa68 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -4900,46 +4900,46 @@ _json_add_object (const NMJsonVt *vt,
                   const char *key3,
                   json_t *value)
 {
-	json_t *json_element, *json_link;
+	json_t *js_element, *js_link;
 
-	json_element = vt->nm_json_object_get (json, key1);
-	if (!json_element) {
-		json_element = value;
+	js_element = vt->nm_json_object_get (json, key1);
+	if (!js_element) {
+		js_element = value;
 		if (key2) {
 			if (key3) {
-				json_element = vt->nm_json_object ();
-				vt->nm_json_object_set_new (json_element, key3, value);
+				js_element = vt->nm_json_object ();
+				vt->nm_json_object_set_new (js_element, key3, value);
 			}
-			json_link = vt->nm_json_object ();
-			vt->nm_json_object_set_new (json_link, key2, json_element);
-			json_element = json_link;
+			js_link = vt->nm_json_object ();
+			vt->nm_json_object_set_new (js_link, key2, js_element);
+			js_element = js_link;
 		}
-		vt->nm_json_object_set_new (json, key1, json_element);
+		vt->nm_json_object_set_new (json, key1, js_element);
 		return;
 	}
 
 	if (!key2)
 		goto key_already_there;
 
-	json_link = json_element;
-	json_element = vt->nm_json_object_get (json_element, key2);
-	if (!json_element) {
-		json_element = value;
+	js_link = js_element;
+	js_element = vt->nm_json_object_get (js_element, key2);
+	if (!js_element) {
+		js_element = value;
 		if (key3) {
-			json_element = vt->nm_json_object ();
-			vt->nm_json_object_set_new (json_element, key3, value);
+			js_element = vt->nm_json_object ();
+			vt->nm_json_object_set_new (js_element, key3, value);
 		}
-		vt->nm_json_object_set_new (json_link, key2, json_element);
+		vt->nm_json_object_set_new (js_link, key2, js_element);
 		return;
 	}
 
 	if (!key3)
 		goto key_already_there;
 
-	json_link = json_element;
-	json_element = vt->nm_json_object_get (json_element, key3);
-	if (!json_element) {
-		vt->nm_json_object_set_new (json_link, key3, value);
+	js_link = js_element;
+	js_element = vt->nm_json_object_get (js_element, key3);
+	if (!js_element) {
+		vt->nm_json_object_set_new (js_link, key3, value);
 		return;
 	}
 
@@ -4957,36 +4957,36 @@ _json_del_object (const NMJsonVt *vt,
                   const char *key2,
                   const char *key3)
 {
-	json_t *json_element = json;
-	json_t *json_link = NULL;
+	json_t *js_element = json;
+	json_t *js_link = NULL;
 	const char *iter_key = key1;
 
 	if (key2) {
-		json_link = json;
-		json_element = vt->nm_json_object_get (json, key1);
-		if (!json_element)
+		js_link = json;
+		js_element = vt->nm_json_object_get (json, key1);
+		if (!js_element)
 			return FALSE;
 		iter_key = key2;
 	}
 	if (key3) {
-		json_link = json_element;
-		json_element = vt->nm_json_object_get (json_element, key2);
-		if (!json_element)
+		js_link = js_element;
+		js_element = vt->nm_json_object_get (js_element, key2);
+		if (!js_element)
 			return FALSE;
 		iter_key = key3;
 	}
 
-	if (vt->nm_json_object_del (json_element, iter_key) != 0)
+	if (vt->nm_json_object_del (js_element, iter_key) != 0)
 		return FALSE;
 
 	/* 1st level key only */
-	if (!json_link)
+	if (!js_link)
 		return TRUE;
 
-	if (vt->nm_json_object_size (json_element) == 0)
-		vt->nm_json_object_del (json_link, (key3 ? key2 : key1));
+	if (vt->nm_json_object_size (js_element) == 0)
+		vt->nm_json_object_del (js_link, (key3 ? key2 : key1));
 
-	if (key3 && vt->nm_json_object_size (json_link) == 0)
+	if (key3 && vt->nm_json_object_size (js_link) == 0)
 		vt->nm_json_object_del (json, key1);
 
 	return TRUE;
@@ -5001,7 +5001,7 @@ _json_team_add_defaults (const NMJsonVt *vt,
                          gboolean port_config,
                          gboolean add_implicit)
 {
-	json_t *json_element;
+	json_t *js_element;
 	const char *runner = NULL;
 
 	if (port_config) {
@@ -5011,16 +5011,16 @@ _json_team_add_defaults (const NMJsonVt *vt,
 	}
 
 	/* Retrieve runner or add default one */
-	json_element = vt->nm_json_object_get (json, "runner");
-	if (json_element) {
-		runner = vt->nm_json_string_value (vt->nm_json_object_get (json_element, "name"));
+	js_element = vt->nm_json_object_get (json, "runner");
+	if (js_element) {
+		runner = vt->nm_json_string_value (vt->nm_json_object_get (js_element, "name"));
 	} else {
-		json_element = vt->nm_json_object ();
-		vt->nm_json_object_set_new (json, "runner", json_element);
+		js_element = vt->nm_json_object ();
+		vt->nm_json_object_set_new (json, "runner", js_element);
 	}
 	if (!runner) {
 		runner = NM_SETTING_TEAM_RUNNER_DEFAULT;
-		vt->nm_json_object_set_new (json_element, "name", vt->nm_json_string (runner));
+		vt->nm_json_object_set_new (js_element, "name", vt->nm_json_string (runner));
 	}
 
 
@@ -5031,11 +5031,11 @@ _json_team_add_defaults (const NMJsonVt *vt,
 		                  vt->nm_json_integer (NM_SETTING_TEAM_NOTIFY_MCAST_COUNT_ACTIVEBACKUP_DEFAULT));
 	} else if (   nm_streq (runner, NM_SETTING_TEAM_RUNNER_LOADBALANCE)
 		   || nm_streq (runner, NM_SETTING_TEAM_RUNNER_LACP)) {
-		json_element = vt->nm_json_array ();
-		vt->nm_json_array_append_new (json_element, vt->nm_json_string ("eth"));
-		vt->nm_json_array_append_new (json_element, vt->nm_json_string ("ipv4"));
-		vt->nm_json_array_append_new (json_element, vt->nm_json_string ("ipv6"));
-		_json_add_object (vt, json, "runner", "tx_hash", NULL, json_element);
+		js_element = vt->nm_json_array ();
+		vt->nm_json_array_append_new (js_element, vt->nm_json_string ("eth"));
+		vt->nm_json_array_append_new (js_element, vt->nm_json_string ("ipv4"));
+		vt->nm_json_array_append_new (js_element, vt->nm_json_string ("ipv6"));
+		_json_add_object (vt, json, "runner", "tx_hash", NULL, js_element);
 	}
 
 	if (!add_implicit)
@@ -5066,20 +5066,20 @@ _json_find_object (const NMJsonVt *vt,
                    const char *key2,
                    const char *key3)
 {
-	json_t *json_element;
+	json_t *js_element;
 
 	if (!key1)
 		return NULL;
-	json_element = vt->nm_json_object_get (json, key1);
-	if (!key2 || !json_element)
-		return json_element;
+	js_element = vt->nm_json_object_get (json, key1);
+	if (!key2 || !js_element)
+		return js_element;
 
-	json_element = vt->nm_json_object_get (json_element, key2);
-	if (!key3 || !json_element)
-		return json_element;
+	js_element = vt->nm_json_object_get (js_element, key2);
+	if (!key3 || !js_element)
+		return js_element;
 
-	json_element = vt->nm_json_object_get (json_element, key3);
-	return json_element;
+	js_element = vt->nm_json_object_get (js_element, key3);
+	return js_element;
 }
 
 static inline void
@@ -5090,12 +5090,12 @@ _json_delete_object_on_int_match (const NMJsonVt *vt,
                                   const char *key3,
                                   int val)
 {
-	json_t *json_element;
+	json_t *js_element;
 
-	json_element = _json_find_object (vt, json, key1, key2, key3);
-	if (!json_element || !nm_json_is_integer (json_element))
+	js_element = _json_find_object (vt, json, key1, key2, key3);
+	if (!js_element || !nm_json_is_integer (js_element))
 		return;
-	if (vt->nm_json_integer_value (json_element) == val)
+	if (vt->nm_json_integer_value (js_element) == val)
 		_json_del_object (vt, json, key1, key2, key3);
 }
 
@@ -5107,12 +5107,12 @@ _json_delete_object_on_bool_match (const NMJsonVt *vt,
                                    const char *key3,
                                    gboolean val)
 {
-	json_t *json_element;
+	json_t *js_element;
 
-	json_element = _json_find_object (vt, json, key1, key2, key3);
-	if (!json_element || !nm_json_is_boolean (json_element))
+	js_element = _json_find_object (vt, json, key1, key2, key3);
+	if (!js_element || !nm_json_is_boolean (js_element))
 		return;
-	if ((!nm_json_boolean_value (json_element)) == (!val))
+	if ((!nm_json_boolean_value (js_element)) == (!val))
 		_json_del_object (vt, json, key1, key2, key3);
 }
 
@@ -5124,19 +5124,19 @@ _json_delete_object_on_string_match (const NMJsonVt *vt,
                                      const char *key3,
                                      const char *val)
 {
-	json_t *json_element;
+	json_t *js_element;
 
-	json_element = _json_find_object (vt, json, key1, key2, key3);
-	if (!json_element || !nm_json_is_string (json_element))
+	js_element = _json_find_object (vt, json, key1, key2, key3);
+	if (!js_element || !nm_json_is_string (js_element))
 		return;
-	if (nm_streq0 (vt->nm_json_string_value (json_element), val))
+	if (nm_streq0 (vt->nm_json_string_value (js_element), val))
 		_json_del_object (vt, json, key1, key2, key3);
 }
 
 static void
 _json_team_normalize_defaults (const NMJsonVt *vt, json_t *json, gboolean reset)
 {
-	json_t *json_element;
+	json_t *js_element;
 	const char *runner = NM_SETTING_TEAM_RUNNER_DEFAULT;
 	int notify_peers_count = 0, notify_peers_interval = 0;
 	int mcast_rejoin_count = 0, mcast_rejoin_interval = 0;
@@ -5144,9 +5144,9 @@ _json_team_normalize_defaults (const NMJsonVt *vt, json_t *json, gboolean reset)
 	gboolean runner_active = FALSE, runner_fast_rate = FALSE;
 	int runner_sys_prio = -1, runner_min_ports = -1;
 
-	json_element = _json_find_object (vt, json, "runner", "name", NULL);
-	if (json_element) {
-		runner = vt->nm_json_string_value (json_element);
+	js_element = _json_find_object (vt, json, "runner", "name", NULL);
+	if (js_element) {
+		runner = vt->nm_json_string_value (js_element);
 		_json_delete_object_on_string_match (vt, json, "runner", "name", NULL,
 		                                     NM_SETTING_TEAM_RUNNER_DEFAULT);
 	}
@@ -5200,7 +5200,7 @@ _json_team_normalize_defaults (const NMJsonVt *vt, json_t *json, gboolean reset)
 }
 
 static NMTeamLinkWatcher *
-_nm_utils_team_link_watcher_from_json (const NMJsonVt *vt, json_t *json_element)
+_nm_utils_team_link_watcher_from_json (const NMJsonVt *vt, json_t *js_element)
 {
 	const char *j_key;
 	json_t *j_val;
@@ -5208,9 +5208,9 @@ _nm_utils_team_link_watcher_from_json (const NMJsonVt *vt, json_t *json_element)
 	int val1 = 0, val2 = 0, val3 = 3;
 	NMTeamLinkWatcherArpPingFlags flags = 0;
 
-	g_return_val_if_fail (json_element, NULL);
+	g_return_val_if_fail (js_element, NULL);
 
-	nm_json_object_foreach (vt, json_element, j_key, j_val) {
+	nm_json_object_foreach (vt, js_element, j_key, j_val) {
 		if (nm_streq (j_key, "name")) {
 			g_free (name);
 			name = strdup (vt->nm_json_string_value (j_val));
@@ -5256,61 +5256,61 @@ _nm_utils_team_link_watcher_to_json (const NMJsonVt *vt, NMTeamLinkWatcher *watc
 	int int_val;
 	const char *str_val;
 	NMTeamLinkWatcherArpPingFlags flags = 0;
-	json_t *json_element;
+	json_t *js_element;
 
 	g_return_val_if_fail (watcher, NULL);
 
-	json_element = vt->nm_json_object ();
+	js_element = vt->nm_json_object ();
 	name = nm_team_link_watcher_get_name (watcher);
 	if (!name)
 		goto fail;
 
-	vt->nm_json_object_set_new (json_element, "name", vt->nm_json_string (name));
+	vt->nm_json_object_set_new (js_element, "name", vt->nm_json_string (name));
 
 	if (nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL)) {
 		int_val = nm_team_link_watcher_get_delay_up (watcher);
 		if (int_val)
-			vt->nm_json_object_set_new (json_element, "delay_up", vt->nm_json_integer (int_val));
+			vt->nm_json_object_set_new (js_element, "delay_up", vt->nm_json_integer (int_val));
 		int_val = nm_team_link_watcher_get_delay_down (watcher);
 		if (int_val)
-			vt->nm_json_object_set_new (json_element, "delay_down", vt->nm_json_integer (int_val));
-		return json_element;
+			vt->nm_json_object_set_new (js_element, "delay_down", vt->nm_json_integer (int_val));
+		return js_element;
 	}
 
 	int_val = nm_team_link_watcher_get_init_wait (watcher);
 	if (int_val)
-		vt->nm_json_object_set_new (json_element, "init_wait", vt->nm_json_integer (int_val));
+		vt->nm_json_object_set_new (js_element, "init_wait", vt->nm_json_integer (int_val));
 	int_val = nm_team_link_watcher_get_interval (watcher);
 	if (int_val)
-		vt->nm_json_object_set_new (json_element, "interval", vt->nm_json_integer (int_val));
+		vt->nm_json_object_set_new (js_element, "interval", vt->nm_json_integer (int_val));
 	int_val = nm_team_link_watcher_get_missed_max (watcher);
 	if (int_val != 3)
-		vt->nm_json_object_set_new (json_element, "missed_max", vt->nm_json_integer (int_val));
+		vt->nm_json_object_set_new (js_element, "missed_max", vt->nm_json_integer (int_val));
 	str_val = nm_team_link_watcher_get_target_host (watcher);
 	if (!str_val)
 		goto fail;
-	vt->nm_json_object_set_new (json_element, "target_host", vt->nm_json_string (str_val));
+	vt->nm_json_object_set_new (js_element, "target_host", vt->nm_json_string (str_val));
 
 	if (nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
-		return json_element;
+		return js_element;
 
 	str_val = nm_team_link_watcher_get_source_host (watcher);
 	if (!str_val)
 		goto fail;
-	vt->nm_json_object_set_new (json_element, "source_host", vt->nm_json_string (str_val));
+	vt->nm_json_object_set_new (js_element, "source_host", vt->nm_json_string (str_val));
 
 	flags = nm_team_link_watcher_get_flags (watcher);
 	if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE)
-		vt->nm_json_object_set_new (json_element, "validate_active", vt->nm_json_string ("true"));
+		vt->nm_json_object_set_new (js_element, "validate_active", vt->nm_json_string ("true"));
 	if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE)
-		vt->nm_json_object_set_new (json_element, "validate_inactive", vt->nm_json_string ("true"));
+		vt->nm_json_object_set_new (js_element, "validate_inactive", vt->nm_json_string ("true"));
 	if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS)
-		vt->nm_json_object_set_new (json_element, "send_always", vt->nm_json_string ("true"));
+		vt->nm_json_object_set_new (js_element, "send_always", vt->nm_json_string ("true"));
 
-	return json_element;
+	return js_element;
 
 fail:
-	nm_json_decref (vt, json_element);
+	nm_json_decref (vt, js_element);
 	return NULL;
 }
 
@@ -5442,7 +5442,7 @@ _nm_utils_team_config_get (const char *conf,
                            gboolean port_config)
 {
 	json_t *json;
-	json_t *json_element;
+	json_t *js_element;
 	GValue *value = NULL;
 	json_error_t jerror;
 	const NMJsonVt *vt;
@@ -5472,39 +5472,39 @@ _nm_utils_team_config_get (const char *conf,
 		_json_team_add_defaults (vt, json, port_config, TRUE);
 
 	/* Now search the property to retrieve */
-	json_element = vt->nm_json_object_get (json, key);
-	if (json_element && key2)
-		json_element = vt->nm_json_object_get (json_element, key2);
-	if (json_element && key3)
-		json_element = vt->nm_json_object_get (json_element, key3);
+	js_element = vt->nm_json_object_get (json, key);
+	if (js_element && key2)
+		js_element = vt->nm_json_object_get (js_element, key2);
+	if (js_element && key3)
+		js_element = vt->nm_json_object_get (js_element, key3);
 
-	if (json_element) {
+	if (js_element) {
 		value = g_new0 (GValue, 1);
-		if (nm_json_is_string (json_element)) {
+		if (nm_json_is_string (js_element)) {
 			g_value_init (value, G_TYPE_STRING);
-			g_value_set_string (value, vt->nm_json_string_value (json_element));
-		} else if (nm_json_is_integer (json_element)) {
+			g_value_set_string (value, vt->nm_json_string_value (js_element));
+		} else if (nm_json_is_integer (js_element)) {
 			g_value_init (value, G_TYPE_INT);
-			g_value_set_int (value, vt->nm_json_integer_value (json_element));
-		} else if (nm_json_is_boolean (json_element)) {
+			g_value_set_int (value, vt->nm_json_integer_value (js_element));
+		} else if (nm_json_is_boolean (js_element)) {
 			g_value_init (value, G_TYPE_BOOLEAN);
-			g_value_set_boolean (value, nm_json_boolean_value (json_element));
+			g_value_set_boolean (value, nm_json_boolean_value (js_element));
 		} else if (nm_streq (key, "link_watch")) {
 			NMTeamLinkWatcher *watcher;
 			GPtrArray *data = g_ptr_array_new_with_free_func
 			                  ((GDestroyNotify) nm_team_link_watcher_unref);
 
-			if (nm_json_is_array (json_element)) {
+			if (nm_json_is_array (js_element)) {
 				json_t *j_watcher;
 				int index;
 
-				nm_json_array_foreach (vt, json_element, index, j_watcher) {
+				nm_json_array_foreach (vt, js_element, index, j_watcher) {
 					watcher = _nm_utils_team_link_watcher_from_json (vt, j_watcher);
 					if (watcher)
 						g_ptr_array_add (data, watcher);
 				}
 			} else {
-				watcher = _nm_utils_team_link_watcher_from_json (vt, json_element);
+				watcher = _nm_utils_team_link_watcher_from_json (vt, js_element);
 				if (watcher)
 					g_ptr_array_add (data, watcher);
 			}
@@ -5514,12 +5514,12 @@ _nm_utils_team_config_get (const char *conf,
 			} else
 				g_ptr_array_free (data, TRUE);
 
-		} else if (nm_json_is_array (json_element)) {
+		} else if (nm_json_is_array (js_element)) {
 			GPtrArray *data = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free);
 			json_t *str_element;
 			int index;
 
-			nm_json_array_foreach (vt, json_element, index, str_element) {
+			nm_json_array_foreach (vt, js_element, index, str_element) {
 				if (nm_json_is_string (str_element))
 					g_ptr_array_add (data, g_strdup (vt->nm_json_string_value (str_element)));
 			}
@@ -5549,7 +5549,7 @@ _nm_utils_team_config_set (char **conf,
                            const char *key3,
                            const GValue *value)
 {
-	json_t *json, *json_element, *json_link, *json_value = NULL;
+	json_t *json, *js_element, *js_link, *js_value = NULL;
 	json_error_t jerror;
 	gboolean updated = FALSE;
 	char **strv;
@@ -5577,11 +5577,11 @@ _nm_utils_team_config_set (char **conf,
 	/* insert new value */
 	updated = TRUE;
 	if (G_VALUE_HOLDS_STRING (value))
-		json_value = vt->nm_json_string (g_value_get_string (value));
+		js_value = vt->nm_json_string (g_value_get_string (value));
 	else if (G_VALUE_HOLDS_INT (value))
-		json_value = vt->nm_json_integer (g_value_get_int (value));
+		js_value = vt->nm_json_integer (g_value_get_int (value));
 	else if (G_VALUE_HOLDS_BOOLEAN (value))
-		json_value = nm_json_boolean (vt, g_value_get_boolean (value));
+		js_value = nm_json_boolean (vt, g_value_get_boolean (value));
 	else if (G_VALUE_HOLDS_BOXED (value)) {
 		if (nm_streq (key, "link_watch")) {
 			array = g_value_get_boxed (value);
@@ -5591,27 +5591,27 @@ _nm_utils_team_config_set (char **conf,
 			}
 
 			/*
-			 * json_value:   will hold the final link_watcher json (array) object
-			 * json_element: is the next link_watcher to append to json_value
-			 * json_link:    used to transit the json_value from a single link_watcher
+			 * js_value:   will hold the final link_watcher json (array) object
+			 * js_element: is the next link_watcher to append to js_value
+			 * js_link:    used to transit the js_value from a single link_watcher
 			 *               object to an array of link watcher objects
 			 */
-			json_value = NULL;
+			js_value = NULL;
 			for (i = 0; i < array->len; i++) {
 				watcher = array->pdata[i];
-				json_element = _nm_utils_team_link_watcher_to_json (vt, watcher);
-				if (!json_element)
+				js_element = _nm_utils_team_link_watcher_to_json (vt, watcher);
+				if (!js_element)
 					continue;
-				if (!json_value) {
-					json_value = json_element;
+				if (!js_value) {
+					js_value = js_element;
 					continue;
 				}
-				if (!nm_json_is_array (json_value)) {
-					json_link = json_value;
-					json_value = vt->nm_json_array ();
-					vt->nm_json_array_append_new (json_value, json_link);
+				if (!nm_json_is_array (js_value)) {
+					js_link = js_value;
+					js_value = vt->nm_json_array ();
+					vt->nm_json_array_append_new (js_value, js_link);
 				}
-				vt->nm_json_array_append_new (json_value, json_element);
+				vt->nm_json_array_append_new (js_value, js_element);
 			}
 		} else if (   nm_streq (key, "runner")
 		           && nm_streq0 (key2, "tx_hash")) {
@@ -5620,9 +5620,9 @@ _nm_utils_team_config_set (char **conf,
 				updated = FALSE;
 				goto done;
 			}
-			json_value = vt->nm_json_array ();
+			js_value = vt->nm_json_array ();
 			for (i = 0; strv[i]; i++)
-				vt->nm_json_array_append_new (json_value, vt->nm_json_string (strv[i]));
+				vt->nm_json_array_append_new (js_value, vt->nm_json_string (strv[i]));
 		} else {
 			updated = FALSE;
 			goto done;
@@ -5634,34 +5634,34 @@ _nm_utils_team_config_set (char **conf,
 	}
 
 	/* Simplest case: first level key only */
-	json_element = json;
-	json_link = NULL;
+	js_element = json;
+	js_link = NULL;
 
 	if (key2) {
-		json_link = json;
-		json_element = vt->nm_json_object_get (json, iter_key);
-		if (!json_element) {
-			json_element = vt->nm_json_object ();
-			vt->nm_json_object_set_new (json_link, iter_key, json_element);
+		js_link = json;
+		js_element = vt->nm_json_object_get (json, iter_key);
+		if (!js_element) {
+			js_element = vt->nm_json_object ();
+			vt->nm_json_object_set_new (js_link, iter_key, js_element);
 		}
 		iter_key = key2;
 	}
 	if (key3) {
-		json_link = json_element;
-		json_element = vt->nm_json_object_get (json_link, iter_key);
-		if (!json_element) {
-			json_element = vt->nm_json_object ();
-			vt->nm_json_object_set_new (json_link, iter_key, json_element);
+		js_link = js_element;
+		js_element = vt->nm_json_object_get (js_link, iter_key);
+		if (!js_element) {
+			js_element = vt->nm_json_object ();
+			vt->nm_json_object_set_new (js_link, iter_key, js_element);
 		}
 		iter_key = key3;
 	}
 
-	vt->nm_json_object_set_new (json_element, iter_key, json_value);
+	vt->nm_json_object_set_new (js_element, iter_key, js_value);
 
 done:
 	if (updated) {
 		_json_team_normalize_defaults (vt, json, (   nm_streq0 (key, "runner")
-		                                          && nm_streq0 (key2, "name")));
+		                                        && nm_streq0 (key2, "name")));
 		g_free (*conf);
 		*conf = vt->nm_json_dumps (json, JSON_PRESERVE_ORDER);
 		/* Don't save an empty config */