diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-09-11 12:36:35 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-09-11 12:39:56 -0500 |
| commit | cbb36acee848bdbfb3480bde3ae6d9ac79137e69 (patch) | |
| tree | dde7f149bba50581f0a8ff85fc6fd9529320ce5e /drivers/atmodem/network-registration.c | |
| parent | 32fc30fa02a6d46b78f45e446b2347754ba2136a (diff) | |
| download | ofono-cbb36acee848bdbfb3480bde3ae6d9ac79137e69.tar.bz2 | |
Rework DECLARE_FAILURE to be a bit nicer
Diffstat (limited to 'drivers/atmodem/network-registration.c')
| -rw-r--r-- | drivers/atmodem/network-registration.c | 52 |
1 files changed, 11 insertions, 41 deletions
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index 43a3f7d7..d6efba23 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -84,9 +84,7 @@ static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data) g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CREG:")) { - DECLARE_FAILURE(e); - - cb(&e, -1, -1, -1, -1, cbd->data); + CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, cbd->data); return; } @@ -131,10 +129,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, -1, -1, -1, -1, data); - } + CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data); } static void cops_cb(gboolean ok, GAtResult *result, gpointer user_data) @@ -197,11 +192,7 @@ out: return; error: - { - DECLARE_FAILURE(e); - - cb(&e, NULL, cbd->data); - } + CALLBACK_WITH_FAILURE(cb, NULL, cbd->data); g_free(cbd); } @@ -280,10 +271,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, NULL, data); - } + CALLBACK_WITH_FAILURE(cb, NULL, data); } static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data) @@ -315,8 +303,7 @@ static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data) list = g_try_new0(struct ofono_network_operator, num); if (!list) { - DECLARE_FAILURE(e); - cb(&e, 0, NULL, cbd->data); + CALLBACK_WITH_FAILURE(cb, 0, NULL, cbd->data); return; } @@ -406,10 +393,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, 0, NULL, data); - } + CALLBACK_WITH_FAILURE(cb, 0, NULL, data); } static void register_cb(gboolean ok, GAtResult *result, gpointer user_data) @@ -441,10 +425,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, data); - } + CALLBACK_WITH_FAILURE(cb, data); } static void at_register_manual(struct ofono_netreg *netreg, @@ -468,10 +449,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, data); - } + CALLBACK_WITH_FAILURE(cb, data); } static void at_deregister(struct ofono_netreg *netreg, @@ -491,10 +469,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, data); - } + CALLBACK_WITH_FAILURE(cb, data); } static inline void report_signal_strength(struct ofono_netreg *netreg, @@ -567,9 +542,7 @@ static void csq_cb(gboolean ok, GAtResult *result, gpointer user_data) g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CSQ:")) { - DECLARE_FAILURE(e); - - cb(&e, -1, cbd->data); + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); return; } @@ -602,10 +575,7 @@ error: if (cbd) g_free(cbd); - { - DECLARE_FAILURE(error); - cb(&error, -1, data); - } + CALLBACK_WITH_FAILURE(cb, -1, data); } static void creg_notify(GAtResult *result, gpointer user_data) |