From 07db961a6ae074787dc763f5ed829cb0d585adaa Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 23 Jul 2012 08:57:19 -0500 Subject: [PATCH] libnm-util: clean up some private symbols Symbols starting with "nm" are expected to be exported, even though these are not since they're static. So don't prefix them with nm. --- libnm-util/nm-connection.c | 11 +++-------- libnm-util/nm-param-spec-specialized.c | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 80a4996d3..e24ec148d 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -486,14 +486,9 @@ nm_connection_get_setting_by_name (NMConnection *connection, const char *name) return type ? nm_connection_get_setting (connection, type) : NULL; } -/** - * nm_connection_get_type_setting: - * @connection: a #NMConnection - * - * Returns: (transfer none): the #NMSetting of the connection base type - */ +/* not exposed until we actually need it */ static NMSetting * -nm_connection_get_type_setting (NMConnection *connection) +_get_type_setting (NMConnection *connection) { NMSettingConnection *s_con; const char *type; @@ -1223,7 +1218,7 @@ nm_connection_get_virtual_iface_name (NMConnection *connection) g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - base = nm_connection_get_type_setting (connection); + base = _get_type_setting (connection); g_assert (base); return nm_setting_get_virtual_iface_name (base); diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 82ec6a40d..06d56f04e 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -372,7 +372,7 @@ _gvalues_compare_map (const GValue *value1, const GValue *value2) } static gint -nm_gvalue_ip6_address_compare (const GValue *value1, const GValue *value2) +_gvalue_ip6_address_compare (const GValue *value1, const GValue *value2) { GValueArray *values1, *values2; GValue *tmp_val; @@ -430,7 +430,7 @@ nm_gvalue_ip6_address_compare (const GValue *value1, const GValue *value2) } static gint -nm_gvalue_ip6_route_compare (const GValue *value1, const GValue *value2) +_gvalue_ip6_route_compare (const GValue *value1, const GValue *value2) { GValueArray *values1, *values2; GValue *tmp_val; @@ -499,9 +499,9 @@ _gvalues_compare_struct (const GValue *value1, const GValue *value2) */ if (G_VALUE_HOLDS (value1, DBUS_TYPE_G_IP6_ADDRESS)) { - return nm_gvalue_ip6_address_compare (value1, value2); + return _gvalue_ip6_address_compare (value1, value2); } else if (G_VALUE_HOLDS (value1, DBUS_TYPE_G_IP6_ROUTE)) { - return nm_gvalue_ip6_route_compare (value1, value2); + return _gvalue_ip6_route_compare (value1, value2); } else { g_warning ("Don't know how to compare structures"); return (value1 == value2);