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

ifcfg-rh-reader: match refactoring

Browse source
This commit is contained in:
Adrian Freihofer 2020-04-21 17:39:25 +02:00 • committed by Thomas Haller
parent e8885db046
commit d8a7f65ef4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1537,27 +1537,34 @@ make_user_setting (shvarFile *ifcfg)
: NULL;
}
static void
make_match_setting_prop (const char *v, NMSettingMatch **s_match,
void (*add_fcn) (NMSettingMatch *s_match, const char *value) ) {
gs_free const char **strv = NULL;
gsize i;
if (v) {
strv = nm_utils_escaped_tokens_split (v, NM_ASCII_SPACES);
if (strv) {
for (i = 0; strv[i]; i++) {
if (!(*s_match))
*s_match = (NMSettingMatch *) nm_setting_match_new ();
add_fcn (*s_match, strv[i]);
}
}
}
}
static NMSetting *
make_match_setting (shvarFile *ifcfg)
{
NMSettingMatch *s_match = NULL;
gs_free const char **strv = NULL;
gs_free char *value = NULL;
gs_free char *value_ifn = NULL;
const char *v;
gsize i;
v = svGetValueStr (ifcfg, "MATCH_INTERFACE_NAME", &value);
if (!v)
return NULL;
strv = nm_utils_escaped_tokens_split (v, NM_ASCII_SPACES);
if (strv) {
for (i = 0; strv[i]; i++) {
if (!s_match)
s_match = (NMSettingMatch *) nm_setting_match_new ();
nm_setting_match_add_interface_name (s_match, strv[i]);
}
}
v = svGetValueStr (ifcfg, "MATCH_INTERFACE_NAME", &value_ifn);
make_match_setting_prop(v, &s_match, nm_setting_match_add_interface_name);
return (NMSetting *) s_match;
}