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

ifcfg-rh: refactor parsing bond options

Browse Source 
Don't use g_strsplit_set() if all we want to do is split the
string at the first '='.
This commit is contained in:
Thomas Haller
2019-04-11 10:57:00 +02:00
parent 7887909564
commit afc258519d
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View File

@@ -4802,18 +4802,18 @@ make_bond_setting (shvarFile *ifcfg,
items = nm_utils_strsplit_set (v, " "); items = nm_utils_strsplit_set (v, " ");
for (iter = items; iter && *iter; iter++) { for (iter = items; iter && *iter; iter++) {
gs_strfreev char **keys = NULL; gs_free char *key = NULL;
const char *key, *val; const char *val;
keys = g_strsplit_set (*iter, "=", 2); val = strchr (*iter, '=');
if (keys && *keys) { if (!val)
key = *keys; continue;
val = *(keys + 1); key = g_strndup (*iter, val - *iter);
if (val && key[0] && val[0]) val++;
if (key[0] && val[0])
handle_bond_option (s_bond, key, val); handle_bond_option (s_bond, key, val);
} }
} }
}
return (NMSetting *) s_bond; return (NMSetting *) s_bond;
} }
@@ -5082,18 +5082,18 @@ handle_bridging_opts (NMSetting *setting,
items = nm_utils_strsplit_set (value, " "); items = nm_utils_strsplit_set (value, " ");
for (iter = items; iter && *iter; iter++) { for (iter = items; iter && *iter; iter++) {
gs_strfreev char **keys = NULL; gs_free char *key = NULL;
const char *key, *val; const char *val;
keys = g_strsplit_set (*iter, "=", 2); val = strchr (*iter, '=');
if (keys && *keys) { if (!val)
key = *keys; continue;
val = *(keys + 1); key = g_strndup (*iter, val - *iter);
if (val && key[0] && val[0]) val++;
if (key[0] && val[0])
func (setting, stp, key, val, opt_type); func (setting, stp, key, val, opt_type);
} }
} }
}
static void static void
read_bridge_vlans (shvarFile *ifcfg, read_bridge_vlans (shvarFile *ifcfg,