summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-04-11 10:57:00 +0200
committerThomas Haller <thaller@redhat.com>2019-04-11 10:58:56 +0200
commit4532e2a498833953865979ad6a6e3eb6cfe6041e (patch)
tree0c109460a4a4eb461469a9505798ae68a33e3d22
parent471248b5c5aedff3fc28512b76b3d849976a57f0 (diff)
downloadNetworkManager-th/strsplit-pt2.tar.gz
ifcfg-rh: refactor parsing bond optionsth/strsplit-pt2
Don't use g_strsplit_set() if all we want to do is split the string at the first '='.
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 14c05b9842..ff71b71017 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -4802,16 +4802,16 @@ make_bond_setting (shvarFile *ifcfg,
items = nm_utils_strsplit_set (v, " ");
for (iter = items; iter && *iter; iter++) {
- gs_strfreev char **keys = NULL;
- const char *key, *val;
-
- keys = g_strsplit_set (*iter, "=", 2);
- if (keys && *keys) {
- key = *keys;
- val = *(keys + 1);
- if (val && key[0] && val[0])
- handle_bond_option (s_bond, key, val);
- }
+ gs_free char *key = NULL;
+ const char *val;
+
+ val = strchr (*iter, '=');
+ if (!val)
+ continue;
+ key = g_strndup (*iter, val - *iter);
+ val++;
+ if (key[0] && val[0])
+ handle_bond_option (s_bond, key, val);
}
}
@@ -5082,16 +5082,16 @@ handle_bridging_opts (NMSetting *setting,
items = nm_utils_strsplit_set (value, " ");
for (iter = items; iter && *iter; iter++) {
- gs_strfreev char **keys = NULL;
- const char *key, *val;
-
- keys = g_strsplit_set (*iter, "=", 2);
- if (keys && *keys) {
- key = *keys;
- val = *(keys + 1);
- if (val && key[0] && val[0])
- func (setting, stp, key, val, opt_type);
- }
+ gs_free char *key = NULL;
+ const char *val;
+
+ val = strchr (*iter, '=');
+ if (!val)
+ continue;
+ key = g_strndup (*iter, val - *iter);
+ val++;
+ if (key[0] && val[0])
+ func (setting, stp, key, val, opt_type);
}
}