fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 18:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-glib: pre-emptively avoid some -Wshadow errors

Browse source 
including <gio/gio.h> will drag in some additional system headers that
result in new -Wshadow warnings. Fix those.
This commit is contained in:
Dan Winship 2012-01-04 13:52:46 -05:00 • committed by Dan Williams
parent f32032694f
commit efadfd8b17
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm-glib/nm-client.c
View file

@ -1160,14 +1160,14 @@ nm_client_networking_set_enabled (NMClient *client, gboolean enable)
/**
* nm_client_sleep:
* @client: a #NMClient
* @sleep: %TRUE to put the daemon to sleep
* @sleep_: %TRUE to put the daemon to sleep
*
* Deprecated; use nm_client_networking_set_enabled() instead.
**/
void
nm_client_sleep (NMClient *client, gboolean sleep)
nm_client_sleep (NMClient *client, gboolean sleep_)
{
nm_client_networking_set_enabled (client, !sleep);
nm_client_networking_set_enabled (client, !sleep_);
}
/**

2
libnm-glib/nm-client.h
View file

@ -156,7 +156,7 @@ const char *nm_client_get_version (NMClient *client);
NMState nm_client_get_state (NMClient *client);
gboolean nm_client_get_manager_running (NMClient *client);
const GPtrArray *nm_client_get_active_connections (NMClient *client);
void nm_client_sleep (NMClient *client, gboolean sleep);
void nm_client_sleep (NMClient *client, gboolean sleep_);
NMClientPermissionResult nm_client_get_permission_result (NMClient *client,
NMClientPermission permission);

8
libnm-glib/nm-types.c
View file

@ -323,11 +323,11 @@ _nm_ip6_address_array_copy (GPtrArray *src)
dest = g_ptr_array_sized_new (src->len);
for (i = 0; i < src->len; i++) {
struct in6_addr *addr = g_ptr_array_index (src, i);
struct in6_addr *dup;
struct in6_addr *copy;
dup = g_malloc0 (sizeof (struct in6_addr));
memcpy (dup, addr, sizeof (struct in6_addr));
g_ptr_array_add (dest, dup);
copy = g_malloc0 (sizeof (struct in6_addr));
memcpy (copy, addr, sizeof (struct in6_addr));
g_ptr_array_add (dest, copy);
}
return dest;
}