diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-18 07:58:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 17:53:09 +0200 |
| commit | 7a92fb6bf4f6a9d285f2d6d5f0f216151ebfbf96 (patch) | |
| tree | 6585fad130a05bdefc58267e9a4d74acc7e21617 | |
| parent | 304eab8703dc1c77211d0c7f32a76932b725bd86 (diff) | |
| download | NetworkManager-7a92fb6bf4f6a9d285f2d6d5f0f216151ebfbf96.tar.gz | |
cli: unify set of characters to tokenize list properties
the only change in behaviour is for VALUE_STRSPLIT_MODE_MULTILIST.
Previously, we would split at " \t,", now we will also split at
the white space characters "\n\r\f".
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 5a1352ccce..1d1a5c6d92 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -195,14 +195,14 @@ _value_strsplit (const char *value, /* note that all modes remove empty tokens (",", "a,,b", ",,"). */ switch (split_mode) { case VALUE_STRSPLIT_MODE_STRIPPED: - strv = nm_utils_strsplit_set (value, NM_ASCII_SPACES","); + strv = nm_utils_strsplit_set (value, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS); NM_SET_OUT (out_len, NM_PTRARRAY_LEN (strv)); return g_steal_pointer (&strv); case VALUE_STRSPLIT_MODE_OBJLIST: - strv = nm_utils_strsplit_set (value, ","); + strv = nm_utils_strsplit_set (value, ESCAPED_TOKENS_DELIMITERS); break; case VALUE_STRSPLIT_MODE_MULTILIST: - strv = nm_utils_strsplit_set (value, " \t,"); + strv = nm_utils_strsplit_set (value, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS); break; case VALUE_STRSPLIT_MODE_ESCAPED_TOKENS: strv = nm_utils_escaped_tokens_split (value, ESCAPED_TOKENS_DELIMITERS); |