From 835ccf2a373075f913ea5627872e1fca5c519f3c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 20 May 2015 12:21:11 +0200 Subject: libnm: move internal dns-option helpers to "nm-core-internal.h" "nm-utils-private.h" should not be used outside of libnm-core/. core/ should only use public API or "nm-core-internal.h". Also, "nm-setting-ip-config.h" is a public header and should not contain internal defines. Move them to "nm-core-internal.h" too. Fixes: 019943bb5d9efea52392610b207dececafa6fdb3 (cherry picked from commit 533f9fa2d2daedb235f8236ca68db3bc7b429005) --- libnm-core/nm-core-internal.h | 18 ++++++++++++++++++ libnm-core/nm-setting-ip-config.h | 8 -------- libnm-core/nm-utils-private.h | 5 ----- src/dns-manager/nm-dns-manager.c | 2 +- src/nm-ip4-config.c | 2 +- src/nm-ip6-config.c | 2 +- src/settings/plugins/ifcfg-rh/writer.c | 1 - 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 73a379c344..922388e80f 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -161,4 +161,22 @@ gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gi gboolean _nm_dbus_error_has_name (GError *error, const char *dbus_error_name); + +/***********************************************************/ + +typedef struct { + const char *name; + gboolean numeric; + gboolean ipv6_only; +} DNSOptionDesc; + +extern const DNSOptionDesc dns_option_descs[]; + +gboolean _nm_utils_dns_option_validate (const char *option, char **out_name, + long *out_value, gboolean ipv6, + const DNSOptionDesc *option_descs); +int _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option); + +/***********************************************************/ + #endif diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index 9c441ebf5b..572a95bb70 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -145,14 +145,6 @@ void nm_ip_route_set_attribute (NMIPRoute *route, #define NM_SETTING_IP_CONFIG_NEVER_DEFAULT "never-default" #define NM_SETTING_IP_CONFIG_MAY_FAIL "may-fail" -typedef struct { - const char *name; - gboolean numeric; - gboolean ipv6_only; -} DNSOptionDesc; - -extern const DNSOptionDesc dns_option_descs[]; - #define NM_SETTING_DNS_OPTION_DEBUG "debug" #define NM_SETTING_DNS_OPTION_NDOTS "ndots" #define NM_SETTING_DNS_OPTION_TIMEOUT "timeout" diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h index 97c1dfe893..34ec537a0f 100644 --- a/libnm-core/nm-utils-private.h +++ b/libnm-core/nm-utils-private.h @@ -27,11 +27,6 @@ gboolean _nm_utils_string_slist_validate (GSList *list, const char **valid_values); -gboolean _nm_utils_dns_option_validate (const char *option, char **out_name, - long *out_value, gboolean ipv6, - const DNSOptionDesc *option_descs); -int _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option); - /* D-Bus transform funcs */ GVariant * _nm_utils_hwaddr_to_dbus (const GValue *prop_value); diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 8bc0ced37f..0d04bf2dbb 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -38,7 +38,7 @@ #include #include "nm-utils.h" -#include "nm-utils-private.h" +#include "nm-core-internal.h" #include "nm-dns-manager.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index fe42d23ad0..a9d60a8c6d 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -36,7 +36,7 @@ #include "nm-route-manager.h" #include "gsystem-local-alloc.h" #include "nm-macros-internal.h" -#include "nm-utils-private.h" +#include "nm-core-internal.h" G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, G_TYPE_OBJECT) diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index c900db5ec5..107b0a5c4d 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -33,7 +33,7 @@ #include "nm-dbus-glib-types.h" #include "nm-ip6-config-glue.h" #include "nm-route-manager.h" -#include "nm-utils-private.h" +#include "nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-macros-internal.h" diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index dbee294b0f..c8659af27d 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -42,7 +42,6 @@ #include #include "nm-core-internal.h" #include -#include #include "nm-core-internal.h" #include "nm-macros-internal.h" -- cgit v1.2.1