diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2010-01-12 10:49:30 +0200 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2010-01-14 10:32:56 +0200 |
| commit | 85df7a952a7d78a5cd07c869999f3312f786d93c (patch) | |
| tree | d94fbd5dce5b69ead342bc993d9f99887f629373 /drivers/isimodem/network-registration.c | |
| parent | 04a3c6cb09bf353e17355047a430a976d75d1530 (diff) | |
| download | ofono-85df7a952a7d78a5cd07c869999f3312f786d93c.tar.bz2 | |
Clean up style issues
Diffstat (limited to 'drivers/isimodem/network-registration.c')
| -rw-r--r-- | drivers/isimodem/network-registration.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 23edf49a..02e2991d 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -264,10 +264,8 @@ static void isi_registration_status(struct ofono_netreg *netreg, return; error: - if (cbd) - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data); + g_free(cbd); } static bool name_get_resp_cb(GIsiClient *client, const void *restrict data, @@ -663,16 +661,16 @@ static void rat_ind_cb(GIsiClient *client, const void *restrict data, case NET_RAT_INFO: { guint8 info = 0; - if (!g_isi_sb_iter_get_byte(&iter, &nd->rat, 2)) + if (!g_isi_sb_iter_get_byte(&iter, &nd->rat, 2) + || !g_isi_sb_iter_get_byte(&iter, &info, 3)) return; - if (!g_isi_sb_iter_get_byte(&iter, &info, 3)) - return; + if (info) { - if (info) if (!g_isi_sb_iter_get_byte(&iter, &nd->gsm_compact, 4)) return; + } break; } @@ -769,7 +767,8 @@ static bool rssi_resp_cb(GIsiClient *client, const void *restrict data, return false; if (msg[1] != NET_CAUSE_OK) { - DBG("Request failed: %s", net_isi_cause_name(msg[1])); + DBG("Request failed: %s (0x%02X)", + net_isi_cause_name(msg[1]), msg[1]); goto error; } |