diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-17 16:29:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 18:51:20 +0200 |
| commit | 55a46f91e5fa878f05038b01126a1a4765e2d213 (patch) | |
| tree | 7611114cbf0080193e41603b00c3f77c0722929d | |
| parent | f4a7c2eb9e8adc2c30f5669b7e2be715cd67980d (diff) | |
cli: drop unused strsplit_with_escape mode for objlist properties
(cherry picked from commit 3f5df5ab7249141d08b0693a38f113e5bf2b3241)
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 10 | ||||
| -rw-r--r-- | clients/common/nm-meta-setting-desc.h | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index a19dba5c3c..9260f6eff5 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -173,7 +173,6 @@ _value_str_as_index_list (const char *value, gsize *out_len) typedef enum { VALUE_STRSPLIT_MODE_STRIPPED, VALUE_STRSPLIT_MODE_OBJLIST, - VALUE_STRSPLIT_MODE_OBJLIST_WITH_ESCAPE, VALUE_STRSPLIT_MODE_MULTILIST, VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE, VALUE_STRSPLIT_MODE_ESCAPED_TOKENS, @@ -206,9 +205,6 @@ _value_strsplit (const char *value, case VALUE_STRSPLIT_MODE_OBJLIST: strv = nm_utils_strsplit_set (value, ","); break; - case VALUE_STRSPLIT_MODE_OBJLIST_WITH_ESCAPE: - strv = nm_utils_strsplit_set_full (value, ",", NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING); - break; case VALUE_STRSPLIT_MODE_MULTILIST: strv = nm_utils_strsplit_set (value, " \t,"); break; @@ -239,8 +235,6 @@ _value_strsplit (const char *value, if (split_mode == VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE) _nm_utils_unescape_plain ((char *) s, MULTILIST_WITH_ESCAPE_CHARS, TRUE); - else if (split_mode == VALUE_STRSPLIT_MODE_OBJLIST_WITH_ESCAPE) - _nm_utils_unescape_plain ((char *) s, ",", TRUE); else g_strchomp ((char *) s); @@ -3305,9 +3299,7 @@ _set_fcn_objlist (ARGS_SET_FCN) strv = _value_strsplit (value, property_info->property_typ_data->subtype.objlist.strsplit_plain ? VALUE_STRSPLIT_MODE_OBJLIST - : ( property_info->property_typ_data->subtype.objlist.strsplit_with_escape - ? VALUE_STRSPLIT_MODE_OBJLIST_WITH_ESCAPE - : VALUE_STRSPLIT_MODE_ESCAPED_TOKENS), + : VALUE_STRSPLIT_MODE_ESCAPED_TOKENS, &nstrv); if (_SET_FCN_DO_SET_ALL (modifier, value)) { diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index 4942563aab..c250700abd 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -298,7 +298,6 @@ struct _NMMetaPropertyTypData { void (*remove_by_idx_fcn_s) (NMSetting *setting, int idx); bool delimit_pretty_with_semicolon:1; bool strsplit_plain:1; - bool strsplit_with_escape:1; } objlist; struct { gboolean (*set_fcn) (NMSetting *setting, |