colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared,libnm: rename nm_json_aux_gstr_*() API to nm_json_gstr_*()

Browse Source
This commit is contained in:
Thomas Haller
2020-07-01 20:12:25 +02:00
parent 4a7da1ca4b
commit 57de0c27a7
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libnm-core/nm-team-utils.c
View File

@@ -459,9 +459,9 @@ _team_attr_data_to_json (const TeamAttrData *attr_data,
_team_attr_data_ASSERT (attr_data); _team_attr_data_ASSERT (attr_data);
nm_assert (p_field); nm_assert (p_field);
nm_json_aux_gstr_append_obj_name (gstr, nm_json_gstr_append_obj_name (gstr,
attr_data->js_keys[attr_data->js_keys_len - 1], attr_data->js_keys[attr_data->js_keys_len - 1],
'\0'); '\0');
if (attr_data->value_type != NM_VALUE_TYPE_UNSPEC) { if (attr_data->value_type != NM_VALUE_TYPE_UNSPEC) {
nm_value_type_to_json (attr_data->value_type, gstr, p_field); nm_value_type_to_json (attr_data->value_type, gstr, p_field);
@@ -481,7 +481,7 @@ _team_attr_data_to_json (const TeamAttrData *attr_data,
g_string_append (gstr, "[ "); g_string_append (gstr, "[ ");
for (i = 0; i < v_ptrarray->len; i++) { for (i = 0; i < v_ptrarray->len; i++) {
if (i > 0) if (i > 0)
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
_link_watcher_to_json (v_ptrarray->pdata[i], gstr); _link_watcher_to_json (v_ptrarray->pdata[i], gstr);
} }
g_string_append (gstr, " ]"); g_string_append (gstr, " ]");
@@ -499,8 +499,8 @@ _team_attr_data_to_json (const TeamAttrData *attr_data,
g_string_append (gstr, "[ "); g_string_append (gstr, "[ ");
for (i = 0; i < v_ptrarray->len; i++) { for (i = 0; i < v_ptrarray->len; i++) {
if (i > 0) if (i > 0)
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
nm_json_aux_gstr_append_string (gstr, v_ptrarray->pdata[i]); nm_json_gstr_append_string (gstr, v_ptrarray->pdata[i]);
} }
g_string_append (gstr, i > 0 ? " ]" : "]"); g_string_append (gstr, i > 0 ? " ]" : "]");
} }
@@ -670,7 +670,7 @@ _team_setting_field_to_json (const NMTeamSetting *self,
return FALSE; return FALSE;
if (prepend_delimiter) if (prepend_delimiter)
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
_team_attr_data_to_json (attr_data, _team_attr_data_to_json (attr_data,
self->d.is_port, self->d.is_port,
gstr, gstr,
@@ -1107,8 +1107,8 @@ _link_watcher_to_json (const NMTeamLinkWatcher *link_watcher,
if (is_first) if (is_first)
is_first = FALSE; is_first = FALSE;
else else
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
nm_json_aux_gstr_append_obj_name (gstr, attr_data->js_key, '\0'); nm_json_gstr_append_obj_name (gstr, attr_data->js_key, '\0');
nm_value_type_to_json (attr_data->value_type, gstr, &p_val->val); nm_value_type_to_json (attr_data->value_type, gstr, &p_val->val);
} }
@@ -1573,15 +1573,15 @@ nm_team_setting_config_get (const NMTeamSetting *self)
nm_assert (list_is_empty); nm_assert (list_is_empty);
nm_json_aux_gstr_append_obj_name (gstr, "runner", '{'); nm_json_gstr_append_obj_name (gstr, "runner", '{');
if (_team_setting_fields_to_json_maybe (self, gstr, !list_is_empty2, attr_lst_runner_pt1, G_N_ELEMENTS (attr_lst_runner_pt1))) if (_team_setting_fields_to_json_maybe (self, gstr, !list_is_empty2, attr_lst_runner_pt1, G_N_ELEMENTS (attr_lst_runner_pt1)))
list_is_empty2 = FALSE; list_is_empty2 = FALSE;
if (_team_setting_has_fields_any_v (self, attr_lst_runner_pt2, G_N_ELEMENTS (attr_lst_runner_pt2))) { if (_team_setting_has_fields_any_v (self, attr_lst_runner_pt2, G_N_ELEMENTS (attr_lst_runner_pt2))) {
if (!list_is_empty2) if (!list_is_empty2)
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
nm_json_aux_gstr_append_obj_name (gstr, "tx_balancer", '{'); nm_json_gstr_append_obj_name (gstr, "tx_balancer", '{');
if (!_team_setting_fields_to_json_maybe (self, gstr, FALSE, attr_lst_runner_pt2, G_N_ELEMENTS (attr_lst_runner_pt2))) if (!_team_setting_fields_to_json_maybe (self, gstr, FALSE, attr_lst_runner_pt2, G_N_ELEMENTS (attr_lst_runner_pt2)))
nm_assert_not_reached (); nm_assert_not_reached ();
g_string_append (gstr, " }"); g_string_append (gstr, " }");
@@ -1598,8 +1598,8 @@ nm_team_setting_config_get (const NMTeamSetting *self)
if (_team_setting_has_fields_any_v (self, attr_lst_notify_peers, G_N_ELEMENTS (attr_lst_notify_peers))) { if (_team_setting_has_fields_any_v (self, attr_lst_notify_peers, G_N_ELEMENTS (attr_lst_notify_peers))) {
if (!list_is_empty) if (!list_is_empty)
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
nm_json_aux_gstr_append_obj_name (gstr, "notify_peers", '{'); nm_json_gstr_append_obj_name (gstr, "notify_peers", '{');
if (!_team_setting_fields_to_json_maybe (self, gstr, FALSE, attr_lst_notify_peers, G_N_ELEMENTS (attr_lst_notify_peers))) if (!_team_setting_fields_to_json_maybe (self, gstr, FALSE, attr_lst_notify_peers, G_N_ELEMENTS (attr_lst_notify_peers)))
nm_assert_not_reached (); nm_assert_not_reached ();
g_string_append (gstr, " }"); g_string_append (gstr, " }");
@@ -1608,8 +1608,8 @@ nm_team_setting_config_get (const NMTeamSetting *self)
if (_team_setting_has_fields_any_v (self, attr_lst_mcast_rejoin, G_N_ELEMENTS (attr_lst_mcast_rejoin))) { if (_team_setting_has_fields_any_v (self, attr_lst_mcast_rejoin, G_N_ELEMENTS (attr_lst_mcast_rejoin))) {
if (!list_is_empty) if (!list_is_empty)
nm_json_aux_gstr_append_delimiter (gstr); nm_json_gstr_append_delimiter (gstr);
nm_json_aux_gstr_append_obj_name (gstr, "mcast_rejoin", '{'); nm_json_gstr_append_obj_name (gstr, "mcast_rejoin", '{');
if (!_team_setting_fields_to_json_maybe (self, gstr, FALSE, attr_lst_mcast_rejoin, G_N_ELEMENTS (attr_lst_mcast_rejoin))) if (!_team_setting_fields_to_json_maybe (self, gstr, FALSE, attr_lst_mcast_rejoin, G_N_ELEMENTS (attr_lst_mcast_rejoin)))
nm_assert_not_reached (); nm_assert_not_reached ();
g_string_append (gstr, " }"); g_string_append (gstr, " }");

18
shared/nm-glib-aux/nm-json-aux.c
View File

@@ -98,9 +98,9 @@ _gstr_append_string_len (GString *gstr,
} }
void void
nm_json_aux_gstr_append_string_len (GString *gstr, nm_json_gstr_append_string_len (GString *gstr,
const char *str, const char *str,
gsize n) gsize n)
{ {
g_return_if_fail (gstr); g_return_if_fail (gstr);
@@ -108,8 +108,8 @@ nm_json_aux_gstr_append_string_len (GString *gstr,
} }
void void
nm_json_aux_gstr_append_string (GString *gstr, nm_json_gstr_append_string (GString *gstr,
const char *str) const char *str)
{ {
g_return_if_fail (gstr); g_return_if_fail (gstr);
@@ -120,14 +120,14 @@ nm_json_aux_gstr_append_string (GString *gstr,
} }
void void
nm_json_aux_gstr_append_obj_name (GString *gstr, nm_json_gstr_append_obj_name (GString *gstr,
const char *key, const char *key,
char start_container) char start_container)
{ {
g_return_if_fail (gstr); g_return_if_fail (gstr);
g_return_if_fail (key); g_return_if_fail (key);
nm_json_aux_gstr_append_string (gstr, key); nm_json_gstr_append_string (gstr, key);
if (start_container != '\0') { if (start_container != '\0') {
nm_assert (NM_IN_SET (start_container, '[', '{')); nm_assert (NM_IN_SET (start_container, '[', '{'));

34
shared/nm-glib-aux/nm-json-aux.h
View File

@@ -11,36 +11,36 @@
/*****************************************************************************/ /*****************************************************************************/
static inline GString * static inline GString *
nm_json_aux_gstr_append_delimiter (GString *gstr) nm_json_gstr_append_delimiter (GString *gstr)
{ {
g_string_append (gstr, ", "); g_string_append (gstr, ", ");
return gstr; return gstr;
} }
void nm_json_aux_gstr_append_string_len (GString *gstr, void nm_json_gstr_append_string_len (GString *gstr,
const char *str, const char *str,
gsize n); gsize n);
void nm_json_aux_gstr_append_string (GString *gstr, void nm_json_gstr_append_string (GString *gstr,
const char *str); const char *str);
static inline void static inline void
nm_json_aux_gstr_append_bool (GString *gstr, nm_json_gstr_append_bool (GString *gstr,
gboolean v) gboolean v)
{ {
g_string_append (gstr, v ? "true" : "false"); g_string_append (gstr, v ? "true" : "false");
} }
static inline void static inline void
nm_json_aux_gstr_append_int64 (GString *gstr, nm_json_gstr_append_int64 (GString *gstr,
gint64 v) gint64 v)
{ {
g_string_append_printf (gstr, "%"G_GINT64_FORMAT, v); g_string_append_printf (gstr, "%"G_GINT64_FORMAT, v);
} }
void nm_json_aux_gstr_append_obj_name (GString *gstr, void nm_json_gstr_append_obj_name (GString *gstr,
const char *key, const char *key,
char start_container); char start_container);
/*****************************************************************************/ /*****************************************************************************/
@@ -285,10 +285,10 @@ nm_value_type_to_json (NMValueType value_type,
nm_assert (gstr); nm_assert (gstr);
switch (value_type) { switch (value_type) {
case NM_VALUE_TYPE_BOOL: nm_json_aux_gstr_append_bool (gstr, *((const bool *) p_field)); return; case NM_VALUE_TYPE_BOOL: nm_json_gstr_append_bool (gstr, *((const bool *) p_field)); return;
case NM_VALUE_TYPE_INT32: nm_json_aux_gstr_append_int64 (gstr, *((const gint32 *) p_field)); return; case NM_VALUE_TYPE_INT32: nm_json_gstr_append_int64 (gstr, *((const gint32 *) p_field)); return;
case NM_VALUE_TYPE_INT: nm_json_aux_gstr_append_int64 (gstr, *((const int *) p_field)); return; case NM_VALUE_TYPE_INT: nm_json_gstr_append_int64 (gstr, *((const int *) p_field)); return;
case NM_VALUE_TYPE_STRING: nm_json_aux_gstr_append_string (gstr, *((const char *const *) p_field)); return; case NM_VALUE_TYPE_STRING: nm_json_gstr_append_string (gstr, *((const char *const *) p_field)); return;
case NM_VALUE_TYPE_UNSPEC: case NM_VALUE_TYPE_UNSPEC:
break; break;
} }