From aae721d0dfee94df777b527be3903121164dab34 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 31 Mar 2017 13:21:47 +0200 Subject: cli: pass arguments for print_data separately of NmcOutputData Don't pass on large structs of input arguments. It only convolutes which arguments are passed, and where they come from. --- clients/cli/common.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'clients/cli/common.c') diff --git a/clients/cli/common.c b/clients/cli/common.c index e2e6dc1dd3..9be3c9525d 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -103,7 +103,7 @@ print_ip4_config (NMIPConfig *cfg4, tmpl = nmc_fields_ip4_config; tmpl_len = sizeof (nmc_fields_ip4_config); - out.indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_IP4_CONFIG_ALL, + out_indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_IP4_CONFIG_ALL, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -164,7 +164,7 @@ print_ip4_config (NMIPConfig *cfg4, g_ptr_array_add (out.output_data, arr); print_data_prepare_width (out.output_data); - print_data (nmc_config, &out); + print_data (nmc_config, out_indices, NULL, 0, &out); return TRUE; } @@ -190,7 +190,7 @@ print_ip6_config (NMIPConfig *cfg6, tmpl = nmc_fields_ip6_config; tmpl_len = sizeof (nmc_fields_ip6_config); - out.indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_IP6_CONFIG_ALL, + out_indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_IP6_CONFIG_ALL, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -247,7 +247,7 @@ print_ip6_config (NMIPConfig *cfg6, g_ptr_array_add (out.output_data, arr); print_data_prepare_width (out.output_data); - print_data (nmc_config, &out); + print_data (nmc_config, out_indices, NULL, 0, &out); return TRUE; } @@ -275,7 +275,7 @@ print_dhcp4_config (NMDhcpConfig *dhcp4, tmpl = nmc_fields_dhcp4_config; tmpl_len = sizeof (nmc_fields_dhcp4_config); - out.indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_DHCP4_CONFIG_ALL, + out_indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_DHCP4_CONFIG_ALL, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -292,7 +292,7 @@ print_dhcp4_config (NMDhcpConfig *dhcp4, g_ptr_array_add (out.output_data, arr); print_data_prepare_width (out.output_data); - print_data (nmc_config, &out); + print_data (nmc_config, out_indices, NULL, 0, &out); return TRUE; } @@ -322,7 +322,7 @@ print_dhcp6_config (NMDhcpConfig *dhcp6, tmpl = nmc_fields_dhcp6_config; tmpl_len = sizeof (nmc_fields_dhcp6_config); - out.indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_DHCP6_CONFIG_ALL, + out_indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_DHCP6_CONFIG_ALL, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -339,7 +339,7 @@ print_dhcp6_config (NMDhcpConfig *dhcp6, g_ptr_array_add (out.output_data, arr); print_data_prepare_width (out.output_data); - print_data (nmc_config, &out); + print_data (nmc_config, out_indices, NULL, 0, &out); return TRUE; } -- cgit v1.2.1