diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-08-09 09:28:30 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-08-11 09:41:07 +0200 |
| commit | 6a51d393b27c71ca3492d1af2dd92d7e77fc0f10 (patch) | |
| tree | 2b4401db34d13a3e995f423f42ba2814c3eea096 /clients/cli | |
| parent | 593f6efeae597fe05f6a1c879d042c5e924d645e (diff) | |
| download | NetworkManager-6a51d393b27c71ca3492d1af2dd92d7e77fc0f10.tar.gz | |
shared: add @allow_escaping argument to @nm_utils_strsplit_set
Diffstat (limited to 'clients/cli')
| -rw-r--r-- | clients/cli/connections.c | 4 | ||||
| -rw-r--r-- | clients/cli/settings.c | 2 | ||||
| -rw-r--r-- | clients/cli/utils.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 5361e11fb1..f4d19ee39c 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1807,7 +1807,7 @@ parse_preferred_connection_order (const char *order, GError **error) gboolean inverse, unique; int i; - strv = nm_utils_strsplit_set (order, ":"); + strv = nm_utils_strsplit_set (order, ":", FALSE); if (!strv) { g_set_error (error, NMCLI_ERROR, 0, _("incorrect string '%s' of '--order' option"), order); @@ -2573,7 +2573,7 @@ parse_passwords (const char *passwd_file, GError **error) return NULL; } - strv = nm_utils_strsplit_set (contents, "\r\n"); + strv = nm_utils_strsplit_set (contents, "\r\n", FALSE); for (iter = strv; *iter; iter++) { gs_free char *iter_s = g_strdup (*iter); diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 2c6baeb426..2d231e1cf3 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -318,7 +318,7 @@ _set_fcn_precheck_connection_secondaries (const char *value, char **iter; gboolean modified = FALSE; - strv0 = nm_utils_strsplit_set (value, " \t,"); + strv0 = nm_utils_strsplit_set (value, " \t,", FALSE); if (!strv0) return TRUE; diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 8cbfe9f2fa..e21c108d22 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -509,7 +509,7 @@ nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, gs_free const char **arr0 = NULL; char **arr; - arr0 = nm_utils_strsplit_set (line ?: "", delim ?: " \t"); + arr0 = nm_utils_strsplit_set (line ?: "", delim ?: " \t", FALSE); if (!arr0) arr = g_new0 (char *, 1); else |