diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-08 17:02:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-07-24 13:01:54 +0200 |
| commit | 3cf622e552b0edc84a12720ab3e3d1c6162340d3 (patch) | |
| tree | 7235d6950d7762c8bb27c98fc9b29683add7d078 | |
| parent | 5372aec7f4856ffd92beb3aced1980ea3fe87c59 (diff) | |
| download | NetworkManager-th/cli-connection-handling-4.tar.gz | |
cli: remove unused argument from nm_meta_selection_create_parse_list()th/cli-connection-handling-4
| -rw-r--r-- | clients/cli/connections.c | 1 | ||||
| -rw-r--r-- | clients/cli/utils.c | 4 | ||||
| -rw-r--r-- | clients/common/nm-meta-setting-access.c | 3 | ||||
| -rw-r--r-- | clients/common/nm-meta-setting-access.h | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index dd5ac874a3..5d8c3daff7 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1965,7 +1965,6 @@ do_connections_show (NmCli *nmc, int argc, char **argv) * a profile has multiple active connections, it will be listed multiple times. * If that's not the case, we filter out these duplicate lines. */ selection = nm_meta_selection_create_parse_list ((const NMMetaAbstractInfo *const*) metagen_con_show, - NULL, fields_str, FALSE, NULL); diff --git a/clients/cli/utils.c b/clients/cli/utils.c index b1e9dfe004..ea2c7de860 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -801,7 +801,7 @@ _output_selection_parse (const NMMetaAbstractInfo *const*fields, gs_unref_array GArray *cols = NULL; guint i; - selection = nm_meta_selection_create_parse_list (fields, NULL, fields_str, FALSE, error); + selection = nm_meta_selection_create_parse_list (fields, fields_str, FALSE, error); if (!selection) return FALSE; @@ -868,7 +868,7 @@ parse_output_fields (const char *fields_str, g_return_val_if_fail (!error || !*error, NULL); g_return_val_if_fail (!out_group_fields || !*out_group_fields, NULL); - selection = nm_meta_selection_create_parse_list (fields_array, NULL, fields_str, TRUE, error); + selection = nm_meta_selection_create_parse_list (fields_array, fields_str, TRUE, error); if (!selection) return NULL; diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index e49fd165f9..cebf8ba8af 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -598,7 +598,6 @@ nm_meta_selection_create_parse_one (const NMMetaAbstractInfo *const* fields_arra NMMetaSelectionResultList * nm_meta_selection_create_parse_list (const NMMetaAbstractInfo *const* fields_array, - const char *fields_prefix, const char *fields_str, /* a comma separated list of selectors */ gboolean validate_nested, GError **error) @@ -625,7 +624,7 @@ nm_meta_selection_create_parse_list (const NMMetaAbstractInfo *const* fields_arr if (!fields_str_cur[0]) continue; if (!_output_selection_select_one (fields_array, - fields_prefix, + NULL, fields_str_cur, validate_nested, &array, diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h index 591d65de0b..9898cc5a79 100644 --- a/clients/common/nm-meta-setting-access.h +++ b/clients/common/nm-meta-setting-access.h @@ -95,7 +95,6 @@ NMMetaSelectionResultList *nm_meta_selection_create_parse_one (const NMMetaAbstr gboolean validate_nested, GError **error); NMMetaSelectionResultList *nm_meta_selection_create_parse_list (const NMMetaAbstractInfo *const* fields_array, - const char *fields_prefix, const char *fields_str, gboolean validate_nested, GError **error); |