From 36198827abe2d5c5cc9546be8a6bbdfb58a2bea8 Mon Sep 17 00:00:00 2001 From: Aki Niemi Date: Wed, 16 Sep 2009 13:43:07 +0300 Subject: [PATCH] Miscellaneous clean-ups --- drivers/isimodem/network-registration.c | 17 +++++++++++------ drivers/isimodem/phonebook.c | 19 ++----------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 6396a85..83075a9 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"); diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c index 7d0fe2d..ac98bbe 100644 --- a/drivers/isimodem/phonebook.c +++ b/drivers/isimodem/phonebook.c @@ -111,16 +111,11 @@ static int decode_read_response(const unsigned char *msg, size_t len, guint8 namelen; guint8 numberlen; - if (g_isi_sb_iter_get_len(&iter) < 8) - goto error; - if (!g_isi_sb_iter_get_word(&iter, &loc, 4) || !g_isi_sb_iter_get_byte(&iter, &namelen, 6) || !g_isi_sb_iter_get_byte(&iter, &numberlen, 7)) goto error; - location = loc; - if (!g_isi_sb_iter_get_alpha_tag(&iter, &name, namelen * 2, 8)) goto error; @@ -128,15 +123,14 @@ static int decode_read_response(const unsigned char *msg, size_t len, if (!g_isi_sb_iter_get_alpha_tag(&iter, &number, numberlen * 2, 8 + namelen * 2)) goto error; + + location = loc; break; } case SIM_PB_SNE: { guint8 snelen; - if (g_isi_sb_iter_get_len(&iter) < 8) - goto error; - if (!g_isi_sb_iter_get_byte(&iter, &snelen, 6)) goto error; @@ -149,9 +143,6 @@ static int decode_read_response(const unsigned char *msg, size_t len, case SIM_PB_ANR: { guint8 anrlen; - if (g_isi_sb_iter_get_len(&iter) < 8) - goto error; - if (!g_isi_sb_iter_get_byte(&iter, &anrlen, 6)) goto error; @@ -164,9 +155,6 @@ static int decode_read_response(const unsigned char *msg, size_t len, case SIM_PB_EMAIL: { guint8 emaillen; - if (g_isi_sb_iter_get_len(&iter) < 8) - goto error; - if (!g_isi_sb_iter_get_byte(&iter, &emaillen, 6)) goto error; @@ -178,9 +166,6 @@ static int decode_read_response(const unsigned char *msg, size_t len, case SIM_PB_STATUS: - if (g_isi_sb_iter_get_len(&iter) < 5) - goto error; - if (!g_isi_sb_iter_get_byte(&iter, &status, 4)) goto error; -- 2.7.4