aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2020-01-30 18:17:52 +0100
committerAleksander Morgado <aleksander@aleksander.es>2020-01-31 14:52:49 +0100
commit281f6560003e38c7c76a2164a6e84fb7c16856f5 (patch)
tree07f283de4ae97ab8cc23ba4fc944e5cb04a6ac52
parent1e39e2a7dd52f8acdddd6910ea503a0c2eaea0a9 (diff)
icera: fix warnings with -Wshadow
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]; | ^~~~~~~~~~
-rw-r--r--plugins/icera/mm-broadband-modem-icera.c12
1 files 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);