colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-util: clean up some private symbols

Browse Source 
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.
This commit is contained in:
Dan Williams
2012-07-23 08:57:19 -05:00
parent 3324bd2cdf
commit 07db961a6a
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libnm-util/nm-connection.c
View File

@@ -486,14 +486,9 @@ nm_connection_get_setting_by_name (NMConnection *connection, const char *name)
return type ? nm_connection_get_setting (connection, type) : NULL; return type ? nm_connection_get_setting (connection, type) : NULL;
} }
/** /* not exposed until we actually need it */
* nm_connection_get_type_setting:
* @connection: a #NMConnection
*
* Returns: (transfer none): the #NMSetting of the connection base type
*/
static NMSetting * static NMSetting *
nm_connection_get_type_setting (NMConnection *connection) _get_type_setting (NMConnection *connection)
{ {
NMSettingConnection *s_con; NMSettingConnection *s_con;
const char *type; 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); 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); g_assert (base);
return nm_setting_get_virtual_iface_name (base); return nm_setting_get_virtual_iface_name (base);

8
libnm-util/nm-param-spec-specialized.c
View File

@@ -372,7 +372,7 @@ _gvalues_compare_map (const GValue *value1, const GValue *value2)
} }
static gint 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; GValueArray *values1, *values2;
GValue *tmp_val; GValue *tmp_val;
@@ -430,7 +430,7 @@ nm_gvalue_ip6_address_compare (const GValue *value1, const GValue *value2)
} }
static gint 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; GValueArray *values1, *values2;
GValue *tmp_val; 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)) { 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)) { } 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 { } else {
g_warning ("Don't know how to compare structures"); g_warning ("Don't know how to compare structures");
return (value1 == value2); return (value1 == value2);