aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-11-30 15:50:26 +0100
committerAleksander Morgado <aleksander@lanedo.com>2012-11-30 16:07:13 +0100
commit89d6f16e0654cc9dca89330ec1e321295e3471f1 (patch)
treeb568fec5fa0648913bc9258e0005cd9b919d9dc5
parent05a42261795f27c4ecd0c4444d6503114322c8b8 (diff)
cdma: skip shadowing error variable
Makes it easier to understand the code.
-rw-r--r--src/mm-generic-cdma.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c
index 5c9bb14c..8a478c15 100644
--- a/src/mm-generic-cdma.c
+++ b/src/mm-generic-cdma.c
@@ -2289,11 +2289,13 @@ simple_reg_callback (MMModemCdma *modem,
/* Not registered yet, queue up a retry */
priv->reg_tries++;
if (priv->reg_tries > 15) {
- error = g_error_new_literal (MM_MOBILE_ERROR,
- MM_MOBILE_ERROR_NO_NETWORK,
- "No service");
- simple_state_machine (MM_MODEM (modem), error, info);
- g_error_free (error);
+ GError *inner_error;
+
+ inner_error = g_error_new_literal (MM_MOBILE_ERROR,
+ MM_MOBILE_ERROR_NO_NETWORK,
+ "No service");
+ simple_state_machine (MM_MODEM (modem), inner_error, info);
+ g_error_free (inner_error);
return;
}
@@ -2722,4 +2724,3 @@ mm_generic_cdma_class_init (MMGenericCdmaClass *generic_class)
TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
-