diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-29 16:25:34 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-29 16:26:28 +0100 |
| commit | a81ad3474d76c70e4a162f1f619907b42fe247c6 (patch) | |
| tree | d5d60afd99e88ba6691e12fdde104bdbf7ba8ff4 | |
| parent | d3520813e841269b839b3a6ffef52d018ac95db4 (diff) | |
| download | NetworkManager-a81ad3474d76c70e4a162f1f619907b42fe247c6.tar.gz | |
ifcfg-rh: replace usage of _nm_utils_strsplit_set() with nm_utils_strsplit_set()
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 34 |
1 files changed, 17 insertions, 17 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 4862809883..7952393953 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -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; - - 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++; + const char **strv; + gsize i, j; + + 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); |