From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:25:23 +0100 Subject: New upstream version 1.16.0 --- src/settings/plugins/ifupdown/nms-ifupdown-parser.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/settings/plugins/ifupdown/nms-ifupdown-parser.c') diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c index 369fa70d..fd5561ae 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -25,10 +25,8 @@ #include "nms-ifupdown-parser.h" -#include #include #include -#include #include #include "nm-core-internal.h" @@ -63,7 +61,7 @@ _ifupdownplugin_guess_connection_type (if_block *block) { const char *ret_type = NULL; - if(nm_streq0 (ifparser_getkey (block, "inet"), "ppp")) + if (nm_streq0 (ifparser_getkey (block, "inet"), "ppp")) ret_type = NM_SETTING_PPP_SETTING_NAME; else { if_data *ifb; @@ -75,7 +73,7 @@ _ifupdownplugin_guess_connection_type (if_block *block) break; } } - if(!ret_type) + if (!ret_type) ret_type = NM_SETTING_WIRED_SETTING_NAME; } -- cgit 1.3.0-6-gf8a5 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- .../plugins/ifupdown/nms-ifupdown-parser.c | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'src/settings/plugins/ifupdown/nms-ifupdown-parser.c') diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c index fd5561ae..239f6415 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -419,17 +419,15 @@ update_wired_setting_from_if_block (NMConnection *connection, static void ifupdown_ip4_add_dns (NMSettingIPConfig *s_ip4, const char *dns) { + gs_free const char **list = NULL; + const char **iter; guint32 addr; - gs_strfreev char **list = NULL; - char **iter; if (dns == NULL) return; - list = g_strsplit_set (dns, " \t", -1); + list = nm_utils_strsplit_set (dns, " \t"); for (iter = list; iter && *iter; iter++) { - if ((*iter)[0] == '\0') - continue; if (!inet_pton (AF_INET, *iter, &addr)) { _LOGW (" ignoring invalid nameserver '%s'", *iter); continue; @@ -524,13 +522,11 @@ update_ip4_setting_from_if_block (NMConnection *connection, /* DNS searches */ search_v = ifparser_getkey (block, "dns-search"); if (search_v) { - gs_strfreev char **list = NULL; - char **iter; + gs_free const char **list = NULL; + 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++) { - if ((*iter)[0] == '\0') - continue; if (!nm_setting_ip_config_add_dns_search (s_ip4, *iter)) _LOGW (" duplicate DNS domain '%s'", *iter); } @@ -546,17 +542,15 @@ update_ip4_setting_from_if_block (NMConnection *connection, static void ifupdown_ip6_add_dns (NMSettingIPConfig *s_ip6, const char *dns) { + gs_free const char **list = NULL; + const char **iter; struct in6_addr addr; - gs_strfreev char **list = NULL; - char **iter; if (dns == NULL) return; - list = g_strsplit_set (dns, " \t", -1); + list = nm_utils_strsplit_set (dns, " \t"); for (iter = list; iter && *iter; iter++) { - if ((*iter)[0] == '\0') - continue; if (!inet_pton (AF_INET6, *iter, &addr)) { _LOGW (" ignoring invalid nameserver '%s'", *iter); continue; @@ -640,13 +634,11 @@ update_ip6_setting_from_if_block (NMConnection *connection, /* DNS searches */ search_v = ifparser_getkey (block, "dns-search"); if (search_v) { - gs_strfreev char **list = NULL; - char **iter; + gs_free const char **list = NULL; + 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++) { - if ((*iter)[0] == '\0') - continue; if (!nm_setting_ip_config_add_dns_search (s_ip6, *iter)) _LOGW (" duplicate DNS domain '%s'", *iter); } -- cgit 1.3.0-6-gf8a5