From c4be9db0058f418ba5dd2ad80782c17f656de12d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 18 Mar 2019 20:46:40 +0100 Subject: [PATCH] shared: move nm_setting_ip_config_get_addr_family() to "shared/nm-libnm-core-utils.h" --- libnm-core/nm-core-internal.h | 12 ------------ shared/nm-libnm-core-utils.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 9b123131e..394ecb567 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -547,18 +547,6 @@ gboolean _nm_utils_team_config_set (char **conf, /*****************************************************************************/ -static inline int -nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip) -{ - if (NM_IS_SETTING_IP4_CONFIG (s_ip)) - return AF_INET; - if (NM_IS_SETTING_IP6_CONFIG (s_ip)) - return AF_INET6; - g_return_val_if_reached (AF_UNSPEC); -} - -/*****************************************************************************/ - guint32 _nm_utils_parse_tc_handle (const char *str, GError **error); void _nm_utils_string_append_tc_parent (GString *string, diff --git a/shared/nm-libnm-core-utils.h b/shared/nm-libnm-core-utils.h index 0fb577859..be369ac48 100644 --- a/shared/nm-libnm-core-utils.h +++ b/shared/nm-libnm-core-utils.h @@ -22,6 +22,8 @@ #include "nm-setting-connection.h" #include "nm-setting-ip-config.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" #include "nm-setting-sriov.h" #include "nm-setting-team.h" #include "nm-setting-vlan.h" @@ -80,4 +82,16 @@ nm_setting_connection_remove_permission_user (NMSettingConnection *setting, nm_setting_connection_remove_permission_by_value (setting, "user", user, NULL); } +/*****************************************************************************/ + +static inline int +nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip) +{ + if (NM_IS_SETTING_IP4_CONFIG (s_ip)) + return AF_INET; + if (NM_IS_SETTING_IP6_CONFIG (s_ip)) + return AF_INET6; + g_return_val_if_reached (AF_UNSPEC); +} + #endif /* __NM_LIBNM_SHARED_UTILS_H__ */