diff options
author | Denis Kenzior <denkenz@gmail.com> | 2009-06-22 13:20:01 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2009-06-22 13:22:14 -0500 |
commit | 369f8d0c84c13727345d64410c102103e08f6275 (patch) | |
tree | 0fb6e4b2e92b5a3008a32054f9763aebdc249d97 /src/sim.c | |
parent | 6ee516ac09518bb1f9fcd31f3abe91a5a00a857c (diff) | |
download | ofono-369f8d0c84c13727345d64410c102103e08f6275.tar.bz2 |
Minor style issues
Diffstat (limited to 'src/sim.c')
-rw-r--r-- | src/sim.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -423,11 +423,15 @@ static gint spdi_operator_compare(gconstpointer a, gconstpointer b) { const struct spdi_operator *opa = a; const struct spdi_operator *opb = b; + gint r; - return strcmp(opa->mcc, opb->mcc) ?: strcmp(opa->mnc, opb->mnc); + if (r = strcmp(opa->mcc, opb->mcc)) + return r; + + return strcmp(opa->mnc, opb->mnc); } -int ofono_operator_in_spdi(struct ofono_modem *modem, +gboolean ofono_operator_in_spdi(struct ofono_modem *modem, const struct ofono_network_operator *op) { struct sim_manager_data *sim = modem->sim_manager; @@ -439,8 +443,8 @@ int ofono_operator_in_spdi(struct ofono_modem *modem, g_strlcpy(spdi_op.mcc, op->mcc, sizeof(spdi_op.mcc)); g_strlcpy(spdi_op.mnc, op->mnc, sizeof(spdi_op.mnc)); - return !!g_slist_find_custom(sim->spdi, - &spdi_op, spdi_operator_compare); + return g_slist_find_custom(sim->spdi, + &spdi_op, spdi_operator_compare) != NULL; } static void sim_spdi_read_cb(const struct ofono_error *error, |