diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-07-15 20:12:51 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-07-15 20:14:12 -0300 |
| commit | 3be98b5b9785f1cfb65e4b8adddca20b470c9d90 (patch) | |
| tree | 365f1883b7da6c95cb9d53bf18e456f645e4339c /drivers/isimodem | |
| parent | c49c3314d17608aa10d0649a0bccc5a8b32a9fc2 (diff) | |
| download | ofono-3be98b5b9785f1cfb65e4b8adddca20b470c9d90.tar.bz2 | |
isimodem: Avoid shadowing variables
Diffstat (limited to 'drivers/isimodem')
| -rw-r--r-- | drivers/isimodem/uicc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isimodem/uicc.c b/drivers/isimodem/uicc.c index df79ae4f..1d7ef21b 100644 --- a/drivers/isimodem/uicc.c +++ b/drivers/isimodem/uicc.c @@ -1324,15 +1324,15 @@ static void uicc_application_list_resp(const GIsiMessage *msg, void *data) } if (!sd->uicc_app_started) { - GHashTableIter iter; + GHashTableIter app_iter; struct uicc_sim_application *app; gpointer key; gpointer value; - g_hash_table_iter_init(&iter, sd->app_table); + g_hash_table_iter_init(&app_iter, sd->app_table); - if (!g_hash_table_iter_next(&iter, &key, &value)) + if (!g_hash_table_iter_next(&app_iter, &key, &value)) return; app = value; @@ -1398,7 +1398,7 @@ static void uicc_card_status_resp(const GIsiMessage *msg, void *data) /* Check if card is ready */ if (card_status == 0x21) { - const uint8_t msg[] = { + const uint8_t req[] = { UICC_APPLICATION_REQ, UICC_APPL_LIST, 0, /* Number of subblocks */ @@ -1407,7 +1407,7 @@ static void uicc_card_status_resp(const GIsiMessage *msg, void *data) DBG("card is ready"); ofono_sim_inserted_notify(sim, TRUE); - if (g_isi_client_send(sd->client, msg, sizeof(msg), + if (g_isi_client_send(sd->client, req, sizeof(req), uicc_application_list_resp, data, NULL)) return; |