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

ifcfg-rh: replace usage of _nm_utils_strsplit_set() with nm_utils_strsplit_set()

Browse source 
(cherry picked from commit a81ad3474d)
This commit is contained in:
Thomas Haller 2017-11-29 16:25:34 +01:00
parent a961a65cea
commit 11eb191302
1 changed files with 16 additions and 16 deletions
Show stats 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

@ -3582,25 +3582,25 @@ make_wireless_security_setting (shvarFile *ifcfg,
return NULL; /* unencrypted */
}
static char **
static const char **
transform_hwaddr_blacklist (const char *blacklist)
{
char **strv, **iter;
int shift = 0;
const char **strv;
gsize i, j;
strv = _nm_utils_strsplit_set (blacklist, " \t", 0);
for (iter = strv; iter && *iter; iter++) {
if (shift) {
*(iter - shift) = *iter;
*iter = NULL;
}
if (!nm_utils_hwaddr_valid (*(iter - shift), ETH_ALEN)) {
PARSE_WARNING ("invalid MAC in HWADDR_BLACKLIST '%s'", *(iter - shift));
g_free (*(iter - shift));
*(iter - shift) = NULL;
shift++;
strv = nm_utils_strsplit_set (blacklist, " \t");
if (!strv)
return NULL;
for (i = 0, j = 0; strv[j]; j++) {
const char *s = strv[j];
if (!nm_utils_hwaddr_valid (s, ETH_ALEN)) {
PARSE_WARNING ("invalid MAC in HWADDR_BLACKLIST '%s'", s);
continue;
}
strv[i++] = s;
}
strv[i] = NULL;
return strv;
}
@ -3637,7 +3637,7 @@ make_wireless_setting (shvarFile *ifcfg,
cvalue = svGetValueStr (ifcfg, "HWADDR_BLACKLIST", &value);
if (cvalue) {
gs_strfreev char **strv = NULL;
gs_free const char **strv = NULL;
strv = transform_hwaddr_blacklist (cvalue);
g_object_set (s_wireless, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, strv, NULL);
@ -4211,7 +4211,7 @@ make_wired_setting (shvarFile *ifcfg,
cvalue = svGetValueStr (ifcfg, "HWADDR_BLACKLIST", &value);
if (cvalue) {
gs_strfreev char **strv = NULL;
gs_free const char **strv = NULL;
strv = transform_hwaddr_blacklist (cvalue);
g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, strv, NULL);