diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2009-09-14 23:43:57 +0300 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2009-09-14 23:43:57 +0300 |
| commit | e58d28f6b6b4782813d2dbf0e78aff95a987ffc1 (patch) | |
| tree | 40a37c1fe6109e98d3af87559516a266b1cb7304 /drivers/isimodem/network-registration.c | |
| parent | 3cec9ac67bd91b02077aab243bfea1ffbf8613f9 (diff) | |
| download | ofono-e58d28f6b6b4782813d2dbf0e78aff95a987ffc1.tar.bz2 | |
Adapt to changed sub-block iterator API
Diffstat (limited to 'drivers/isimodem/network-registration.c')
| -rw-r--r-- | drivers/isimodem/network-registration.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 85b34c32..7ca183cd 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -205,9 +205,11 @@ static gboolean decode_reg_status(struct netreg_data *nd, const guint8 *msg, { GIsiSubBlockIter iter; - if (!g_isi_sb_iter_init(msg, len, &iter)) + if (!g_isi_sb_iter_init(msg, len, &iter, false)) return FALSE; + DBG("%d", g_isi_sb_iter_is_valid(&iter)); + while (g_isi_sb_iter_is_valid(&iter)) { switch (g_isi_sb_iter_get_id(&iter)) { @@ -411,7 +413,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)) + if (!g_isi_sb_iter_init(msg + 7, len - 7, &iter, false)) goto error; while (g_isi_sb_iter_is_valid(&iter)) { @@ -530,7 +532,7 @@ static bool available_resp_cb(GIsiClient *client, const void *restrict data, total = msg[2] / 2; list = alloca(total * sizeof(struct ofono_network_operator)); - if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter)) + if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false)) goto error; while (g_isi_sb_iter_is_valid(&iter)) { @@ -795,7 +797,7 @@ static void rat_ind_cb(GIsiClient *client, const void *restrict data, if (!msg || len < 3 || msg[0] != NET_RAT_IND) return; - if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter)) + if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false)) return; while (g_isi_sb_iter_is_valid(&iter)) { @@ -854,7 +856,7 @@ static bool rat_resp_cb(GIsiClient *client, const void *restrict data, return true; } - if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter)) + if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false)) return true; while (g_isi_sb_iter_is_valid(&iter)) { @@ -923,7 +925,7 @@ static bool rssi_resp_cb(GIsiClient *client, const void *restrict data, goto error; } - if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter)) + if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false)) goto error; while (g_isi_sb_iter_is_valid(&iter)) { |