fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 11:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: use escaped_tokens API for bridge vlans

Browse source 
(cherry picked from commit 9f23c5e2de)
This commit is contained in:
Beniamino Galvani 2019-04-17 14:40:11 +02:00
parent 116218110f
commit 6ac953e9b3
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/common/nm-meta-setting-desc.c
View file

@ -3559,7 +3559,7 @@ _objlist_obj_to_str_fcn_bridge_vlans (NMMetaAccessorGetType get_type,
s = nm_bridge_vlan_to_str (vlan, NULL);
if (s)
g_string_append (str, s);
nm_utils_escaped_tokens_escape_gstr_assert (s, ESCAPED_TOKENS_DELIMITERS, str);
}
static gboolean
@ -4991,6 +4991,7 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
.clear_all_fcn = OBJLIST_CLEAR_ALL_FCN (NMSettingBridge, nm_setting_bridge_clear_vlans),
.obj_to_str_fcn = _objlist_obj_to_str_fcn_bridge_vlans,
.set_fcn = _objlist_set_fcn_bridge_vlans,
.strsplit_escaped_tokens = TRUE,
),
),
),
@ -5026,6 +5027,7 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE_PORT[] = {
.clear_all_fcn = OBJLIST_CLEAR_ALL_FCN (NMSettingBridgePort, nm_setting_bridge_port_clear_vlans),
.obj_to_str_fcn = _objlist_obj_to_str_fcn_bridge_vlans,
.set_fcn = _objlist_set_fcn_bridge_vlans,
.strsplit_escaped_tokens = TRUE,
),
),
),

4
libnm-core/nm-keyfile.c
View file

@ -1642,7 +1642,7 @@ bridge_vlan_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
strv = nm_utils_strsplit_set (value, ",");
strv = nm_utils_escaped_tokens_split (value, ",");
if (strv) {
for (iter = strv; *iter; iter++) {
vlan = nm_bridge_vlan_from_str (*iter, &local);
@ -2009,7 +2009,7 @@ bridge_vlan_writer (KeyfileWriterInfo *info,
continue;
if (string->len > 0)
g_string_append (string, ",");
g_string_append (string, vlan_str);
nm_utils_escaped_tokens_escape_gstr_assert (vlan_str, ",", string);
}
nm_keyfile_plugin_kf_set_string (info->keyfile,

2
libnm-core/nm-setting-bridge.c
View file

@ -458,7 +458,7 @@ nm_bridge_vlan_from_str (const char *str, GError **error)
g_return_val_if_fail (str, NULL);
g_return_val_if_fail (!error || !*error, NULL);
tokens = nm_utils_strsplit_set (str, " ");
tokens = nm_utils_escaped_tokens_split (str, NM_ASCII_SPACES);
if (!tokens || !tokens[0]) {
g_set_error_literal (error,
NM_CONNECTION_ERROR,

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -5114,7 +5114,7 @@ read_bridge_vlans (shvarFile *ifcfg,
array = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
strv = nm_utils_strsplit_set (value, ",");
strv = nm_utils_escaped_tokens_split (value, ",");
if (strv) {
for (iter = strv; *iter; iter++) {
vlan = nm_bridge_vlan_from_str (*iter, &local);

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -1492,7 +1492,7 @@ write_bridge_vlans (NMSetting *setting,
return FALSE;
if (string->len > 0)
g_string_append (string, ",");
g_string_append (string, vlan_str);
nm_utils_escaped_tokens_escape_gstr_assert (vlan_str, ",", string);
}
svSetValueStr (ifcfg, key, string->str);