SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem: fix warnings with -Wshadow

Browse Source 
mm-broadband-modem.c: In function ‘modem_create_bearer’:
  mm-broadband-modem.c:421:42: error: declaration of ‘properties’ shadows a global declaration [-Werror=shadow]
    421 |                      MMBearerProperties *properties,
        |                      ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
  mm-broadband-modem.c:132:20: note: shadowed declaration is here
    132 | static GParamSpec *properties[PROP_LAST];
        |                    ^~~~~~~~~~
This commit is contained in:
Aleksander Morgado
2020-01-30 11:59:14 +01:00
parent 6887cfda71
commit cf86e94b8a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem.c
+6 -7
View File
@@ -418,7 +418,7 @@ broadband_bearer_new_ready (GObject *source,
static void
modem_create_bearer (MMIfaceModem *self,
MMBearerProperties *properties,
MMBearerProperties *props,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -429,7 +429,7 @@ modem_create_bearer (MMIfaceModem *self,
/* We just create a MMBroadbandBearer */
mm_dbg ("Creating Broadband bearer in broadband modem");
mm_broadband_bearer_new (MM_BROADBAND_MODEM (self),
properties,
props,
NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_new_ready,
task);
@@ -1519,7 +1519,6 @@ csim_ready (MMBaseModem *self,
g_error_free (error);
} else {
gint val;
GError *error = NULL;
val = mm_parse_csim_response (response, &error);
if (val < 0) {
@@ -5479,14 +5478,14 @@ cancel_command_ready (MMBroadbandModem *self,
/* Complete the pending action, regardless of the CUSD result */
if (self->priv->pending_ussd_action) {
GTask *task;
GTask *pending_task;
task = self->priv->pending_ussd_action;
pending_task = self->priv->pending_ussd_action;
self->priv->pending_ussd_action = NULL;
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_ABORTED,
g_task_return_new_error (pending_task, MM_CORE_ERROR, MM_CORE_ERROR_ABORTED,
"USSD session was cancelled");
g_object_unref (task);
g_object_unref (pending_task);
}
mm_iface_modem_3gpp_ussd_update_state (MM_IFACE_MODEM_3GPP_USSD (self),