Merge remote-tracking branch 'salsa/upstream' into upstream

1 files changed, 12 insertions, 5 deletions

diff --git a/clients/cli/common.h b/clients/cli/common.h
index 8f4e47c2..c180dfb7 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -25,9 +25,16 @@
 #include "nmcli.h"
 #include "nm-secret-agent-simple.h"
 
-gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, const char *one_field);
-gboolean print_ip6_config (NMIPConfig *cfg6, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field);
-gboolean print_dhcp_config (NMDhcpConfig *dhcp, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field);
+
+gboolean print_ip_config (NMIPConfig *cfg,
+                          int addr_family,
+                          const NmcConfig *nmc_config,
+                          const char *one_field);
+
+gboolean print_dhcp_config (NMDhcpConfig *dhcp,
+                            int addr_family,
+                            const NmcConfig *nmc_config,
+                            const char *one_field);
 
 NMConnection *nmc_find_connection (const GPtrArray *connections,
                                    const char *filter_type,
@@ -83,7 +90,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 nmc_fields_dhcp_config[];
+extern const NmcMetaGenericInfo *const metagen_ip6_config[];
+extern const NmcMetaGenericInfo *const metagen_dhcp_config[];
 
 #endif /* NMC_COMMON_H */