diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2009-09-16 13:43:07 +0300 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2009-09-16 23:37:23 +0300 |
| commit | 36198827abe2d5c5cc9546be8a6bbdfb58a2bea8 (patch) | |
| tree | 2e3a3fc42b7195a1bc92a2f9b394ac6770bc6dd6 /drivers/isimodem/network-registration.c | |
| parent | 866c394882bdf64fd0fbefbf59c4eaf52f3d71fc (diff) | |
| download | ofono-36198827abe2d5c5cc9546be8a6bbdfb58a2bea8.tar.bz2 | |
Miscellaneous clean-ups
Diffstat (limited to 'drivers/isimodem/network-registration.c')
| -rw-r--r-- | drivers/isimodem/network-registration.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 6396a855..83075a94 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -267,7 +267,7 @@ static gboolean decode_reg_status(struct netreg_data *nd, const guint8 *msg, } default: - DBG("Skipping sub-block: 0x%02X (%zd bytes)", + DBG("Skipping sub-block: 0x%02X (%zu bytes)", g_isi_sb_iter_get_id(&iter), g_isi_sb_iter_get_len(&iter)); break; @@ -359,7 +359,8 @@ static void isi_registration_status(struct ofono_netreg *netreg, if (!cbd) goto error; - if (g_isi_request_make(nd->client, msg, sizeof(msg), NETWORK_TIMEOUT, + if (g_isi_request_make(nd->client, msg, sizeof(msg), + NETWORK_TIMEOUT, reg_status_resp_cb, cbd)) return; @@ -395,7 +396,7 @@ static bool name_get_resp_cb(GIsiClient *client, const void *restrict data, goto error; } - if (!g_isi_sb_iter_init(msg + 7, len - 7, &iter, false)) + if (!g_isi_sb_iter_init(msg+7, len-7, &iter, false)) goto error; while (g_isi_sb_iter_is_valid(&iter)) { @@ -419,6 +420,7 @@ static bool name_get_resp_cb(GIsiClient *client, const void *restrict data, goto error; strncpy(op.name, tag, OFONO_MAX_OPERATOR_NAME_LENGTH); + op.name[OFONO_MAX_OPERATOR_NAME_LENGTH] = '\0'; g_free(tag); break; } @@ -465,7 +467,8 @@ static void isi_current_operator(struct ofono_netreg *netreg, if (!cbd) goto error; - if (g_isi_request_make(nd->client, msg, sizeof(msg), NETWORK_TIMEOUT, + if (g_isi_request_make(nd->client, msg, sizeof(msg), + NETWORK_TIMEOUT, name_get_resp_cb, cbd)) return; @@ -941,7 +944,8 @@ static void isi_strength(struct ofono_netreg *netreg, if (!cbd) goto error; - if (g_isi_request_make(nd->client, msg, sizeof(msg), NETWORK_TIMEOUT, + if (g_isi_request_make(nd->client, msg, sizeof(msg), + NETWORK_TIMEOUT, rssi_resp_cb, cbd)) return; @@ -970,7 +974,8 @@ static gboolean isi_netreg_register(gpointer user) g_isi_subscribe(nd->client, NET_RAT_IND, rat_ind_cb, netreg); /* Bootstrap current RAT setting */ - if (!g_isi_request_make(nd->client, rat, sizeof(rat), NETWORK_TIMEOUT, + if (!g_isi_request_make(nd->client, rat, sizeof(rat), + NETWORK_TIMEOUT, rat_resp_cb, netreg)) DBG("Failed to bootstrap RAT"); |