diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-04-26 17:55:27 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-26 16:44:35 +0200 |
| commit | 47fc227c7c9c9f9dcd255c3e0a21828b66fb1588 (patch) | |
| tree | c839118fbe73295d8e4f012a5c6b8067aac205c8 | |
| parent | 4742a4cd65fa1823f5ebd8b24f835e156795f521 (diff) | |
| download | NetworkManager-47fc227c7c9c9f9dcd255c3e0a21828b66fb1588.tar.gz | |
cli: drop duplicate IPv6 property metadata
| -rw-r--r-- | clients/cli/common.c | 10 | ||||
| -rw-r--r-- | clients/cli/common.h | 2 | ||||
| -rw-r--r-- | clients/cli/connections.c | 2 | ||||
| -rw-r--r-- | clients/cli/devices.c | 2 | ||||
| -rw-r--r-- | clients/cli/nmcli.c | 2 |
5 files changed, 4 insertions, 14 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c index 39ee2c0b52..585ea71192 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -331,16 +331,6 @@ const NmcMetaGenericInfo *const metagen_dhcp_config[_NMC_GENERIC_INFO_TYPE_DHCP_ /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_ip6_config[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("ADDRESS"), /* 1 */ - NMC_META_GENERIC ("GATEWAY"), /* 2 */ - NMC_META_GENERIC ("ROUTE"), /* 3 */ - NMC_META_GENERIC ("DNS"), /* 4 */ - NMC_META_GENERIC ("DOMAIN"), /* 5 */ - NULL, -}; - gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, diff --git a/clients/cli/common.h b/clients/cli/common.h index 2a5e3ffbed..d695d5c333 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -83,7 +83,7 @@ void nmc_complete_bool (const char *prefix); const char *nmc_error_get_simple_message (GError *error); extern const NmcMetaGenericInfo *const metagen_ip4_config[]; -extern const NmcMetaGenericInfo *const nmc_fields_ip6_config[]; +extern const NmcMetaGenericInfo *const metagen_ip6_config[]; extern const NmcMetaGenericInfo *const metagen_dhcp_config[]; #endif /* NMC_COMMON_H */ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 4d1ce9e0ee..46c736259c 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -777,7 +777,7 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = { NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_con_active_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 1 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 2 */ - NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 3 */ + NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config), /* 3 */ NMC_META_GENERIC_WITH_NESTED ("DHCP6", metagen_dhcp_config), /* 4 */ NMC_META_GENERIC_WITH_NESTED ("VPN", metagen_con_active_vpn), /* 5 */ NULL, diff --git a/clients/cli/devices.c b/clients/cli/devices.c index ec0ae94c8c..98ccf97383 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -210,7 +210,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED ("NSP", nmc_fields_dev_wimax_list + 1), /* 6 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 7 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 8 */ - NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 9 */ + NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config), /* 9 */ NMC_META_GENERIC_WITH_NESTED ("DHCP6", metagen_dhcp_config), /* 10 */ NMC_META_GENERIC_WITH_NESTED ("BOND", nmc_fields_dev_show_master_prop + 1), /* 11 */ NMC_META_GENERIC_WITH_NESTED ("TEAM", nmc_fields_dev_show_team_prop + 1), /* 12 */ diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index cecd5f3fbf..361cc3d3a9 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -190,7 +190,7 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_ip4_config); complete_field (h, metagen_dhcp_config); - complete_field (h, nmc_fields_ip6_config); + complete_field (h, metagen_ip6_config); complete_field (h, metagen_con_show); complete_field (h, metagen_con_active_general); complete_field (h, metagen_con_active_vpn); |