From 281f6560003e38c7c76a2164a6e84fb7c16856f5 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Thu, 30 Jan 2020 18:17:52 +0100
Subject: [PATCH] icera: fix warnings with -Wshadow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  icera/mm-broadband-modem-icera.c: In function ‘modem_create_bearer’:
  icera/mm-broadband-modem-icera.c:873:42: error: declaration of ‘properties’ shadows a global declaration [-Werror=shadow]
    873 |                      MMBearerProperties *properties,
        |                      ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
  icera/mm-broadband-modem-icera.c:57:20: note: shadowed declaration is here
     57 | static GParamSpec *properties[PROP_LAST];
        |                    ^~~~~~~~~~
---
 plugins/icera/mm-broadband-modem-icera.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c
index 30cd54c1..626340bb 100644
--- a/plugins/icera/mm-broadband-modem-icera.c
+++ b/plugins/icera/mm-broadband-modem-icera.c
@@ -869,10 +869,10 @@ broadband_bearer_new_ready (GObject *source,
 }
 
 static void
-modem_create_bearer (MMIfaceModem *self,
-                     MMBearerProperties *properties,
-                     GAsyncReadyCallback callback,
-                     gpointer user_data)
+modem_create_bearer (MMIfaceModem        *self,
+                     MMBearerProperties  *props,
+                     GAsyncReadyCallback  callback,
+                     gpointer             user_data)
 {
     GTask *task;
 
@@ -883,7 +883,7 @@ modem_create_bearer (MMIfaceModem *self,
         mm_broadband_bearer_icera_new (
             MM_BROADBAND_MODEM (self),
             MM_BROADBAND_MODEM_ICERA (self)->priv->default_ip_method,
-            properties,
+            props,
             NULL, /* cancellable */
             (GAsyncReadyCallback)broadband_bearer_icera_new_ready,
             task);
@@ -893,7 +893,7 @@ modem_create_bearer (MMIfaceModem *self,
     /* Otherwise, plain generic broadband bearer */
     mm_broadband_bearer_new (
         MM_BROADBAND_MODEM (self),
-        properties,
+        props,
         NULL, /* cancellable */
         (GAsyncReadyCallback)broadband_bearer_new_ready,
         task);