From efadfd8b17ac1e6d04bd982acb5dab02571a3fd4 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 4 Jan 2012 13:52:46 -0500 Subject: [PATCH] libnm-glib: pre-emptively avoid some -Wshadow errors including will drag in some additional system headers that result in new -Wshadow warnings. Fix those. --- libnm-glib/nm-client.c | 6 +++--- libnm-glib/nm-client.h | 2 +- libnm-glib/nm-types.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 918bc99788..c622d25931 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -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_); } /** diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index c9fd7c104f..44f1d2b53a 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -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); diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index 85981133aa..098af8d8ec 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -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; }