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

ifupdown: replace g_strsplit_set() by nm_utils_strsplit_set()

Browse Source 
Note that nm_utils_strsplit_set() drops empty tokens (consecutive delimiters).
This is what all callers here want anyway.
This commit is contained in:
Thomas Haller
2019-04-11 09:52:06 +02:00
parent f28a618889
commit 03b6be8319
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/settings/plugins/ifupdown/nms-ifupdown-parser.c
View File

@@ -419,17 +419,15 @@ update_wired_setting_from_if_block (NMConnection *connection,
static void static void
ifupdown_ip4_add_dns (NMSettingIPConfig *s_ip4, const char *dns) ifupdown_ip4_add_dns (NMSettingIPConfig *s_ip4, const char *dns)
{ {
gs_free const char **list = NULL;
const char **iter;
guint32 addr; guint32 addr;
gs_strfreev char **list = NULL;
char **iter;
if (dns == NULL) if (dns == NULL)
return; return;
list = g_strsplit_set (dns, " \t", -1); list = nm_utils_strsplit_set (dns, " \t");
for (iter = list; iter && *iter; iter++) { for (iter = list; iter && *iter; iter++) {
if ((*iter)[0] == '\0')
continue;
if (!inet_pton (AF_INET, *iter, &addr)) { if (!inet_pton (AF_INET, *iter, &addr)) {
_LOGW (" ignoring invalid nameserver '%s'", *iter); _LOGW (" ignoring invalid nameserver '%s'", *iter);
continue; continue;
@@ -524,13 +522,11 @@ update_ip4_setting_from_if_block (NMConnection *connection,
/* DNS searches */ /* DNS searches */
search_v = ifparser_getkey (block, "dns-search"); search_v = ifparser_getkey (block, "dns-search");
if (search_v) { if (search_v) {
gs_strfreev char **list = NULL; gs_free const char **list = NULL;
char **iter; const char **iter;
list = g_strsplit_set (search_v, " \t", -1); list = nm_utils_strsplit_set (search_v, " \t");
for (iter = list; iter && *iter; iter++) { for (iter = list; iter && *iter; iter++) {
if ((*iter)[0] == '\0')
continue;
if (!nm_setting_ip_config_add_dns_search (s_ip4, *iter)) if (!nm_setting_ip_config_add_dns_search (s_ip4, *iter))
_LOGW (" duplicate DNS domain '%s'", *iter); _LOGW (" duplicate DNS domain '%s'", *iter);
} }
@@ -546,17 +542,15 @@ update_ip4_setting_from_if_block (NMConnection *connection,
static void static void
ifupdown_ip6_add_dns (NMSettingIPConfig *s_ip6, const char *dns) ifupdown_ip6_add_dns (NMSettingIPConfig *s_ip6, const char *dns)
{ {
gs_free const char **list = NULL;
const char **iter;
struct in6_addr addr; struct in6_addr addr;
gs_strfreev char **list = NULL;
char **iter;
if (dns == NULL) if (dns == NULL)
return; return;
list = g_strsplit_set (dns, " \t", -1); list = nm_utils_strsplit_set (dns, " \t");
for (iter = list; iter && *iter; iter++) { for (iter = list; iter && *iter; iter++) {
if ((*iter)[0] == '\0')
continue;
if (!inet_pton (AF_INET6, *iter, &addr)) { if (!inet_pton (AF_INET6, *iter, &addr)) {
_LOGW (" ignoring invalid nameserver '%s'", *iter); _LOGW (" ignoring invalid nameserver '%s'", *iter);
continue; continue;
@@ -640,13 +634,11 @@ update_ip6_setting_from_if_block (NMConnection *connection,
/* DNS searches */ /* DNS searches */
search_v = ifparser_getkey (block, "dns-search"); search_v = ifparser_getkey (block, "dns-search");
if (search_v) { if (search_v) {
gs_strfreev char **list = NULL; gs_free const char **list = NULL;
char **iter; const char **iter;
list = g_strsplit_set (search_v, " \t", -1); list = nm_utils_strsplit_set (search_v, " \t");
for (iter = list; iter && *iter; iter++) { for (iter = list; iter && *iter; iter++) {
if ((*iter)[0] == '\0')
continue;
if (!nm_setting_ip_config_add_dns_search (s_ip6, *iter)) if (!nm_setting_ip_config_add_dns_search (s_ip6, *iter))
_LOGW (" duplicate DNS domain '%s'", *iter); _LOGW (" duplicate DNS domain '%s'", *iter);
} }

10
src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
View File

@@ -175,14 +175,14 @@ initialize (NMSettingsPlugin *plugin)
const char *ports = ifparser_getkey (block, "bridge-ports"); const char *ports = ifparser_getkey (block, "bridge-ports");
if (ports) { if (ports) {
guint i;
int state = 0; int state = 0;
gs_strfreev char **port_ifaces = NULL; gs_free const char **port_ifaces = NULL;
gsize i;
_LOGD ("parse: found bridge ports %s for %s", ports, block->name); _LOGD ("parse: found bridge ports %s for %s", ports, block->name);
port_ifaces = g_strsplit_set (ports, " \t", -1); port_ifaces = nm_utils_strsplit_set (ports, " \t");
for (i = 0; port_ifaces[i]; i++) { for (i = 0; port_ifaces && port_ifaces[i]; i++) {
const char *token = port_ifaces[i]; const char *token = port_ifaces[i];
/* Skip crazy stuff like regex or all */ /* Skip crazy stuff like regex or all */
@@ -200,7 +200,7 @@ initialize (NMSettingsPlugin *plugin)
} }
if (nm_streq (token, "none")) if (nm_streq (token, "none"))
continue; continue;
if (state == 0 && strlen (token) > 0) { if (state == 0) {
conn = g_hash_table_lookup (priv->eni_ifaces, block->name); conn = g_hash_table_lookup (priv->eni_ifaces, block->name);
if (!conn) { if (!conn) {
_LOGD ("parse: adding bridge port \"%s\"", token); _LOGD ("parse: adding bridge port \"%s\"", token);