2009/9/17 Denis Kenzior <[email protected]>: >> 2009/9/16 Andrzej Zaborowski <[email protected]>: >> > So here's another version generated on top of HEAD and with an attempt >> > to detect when the card uses EFlp format instead of EFli. >> >> Sorry, I sent the wrong file, here's the *actual* new version. > > Patch has been applied. I cleaned it up a little afterward. Let me know if I > broke anything.
The only corner case where order is now different is when the first item in EFli is empty and other items aren't. Attached a cosmetic patch. Regards
From b0323a75872138ffd883d843b4d0bc816c367a2d Mon Sep 17 00:00:00 2001 From: Andrzej Zaborowski <[email protected]> Date: Wed, 23 Sep 2009 23:23:43 +0200 Subject: [PATCH] Rename eflp_format to efli_format, semantically opposite. --- src/sim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sim.c b/src/sim.c index 1a4edc4..ec003ee 100644 --- a/src/sim.c +++ b/src/sim.c @@ -1065,7 +1065,7 @@ static void sim_efpl_read_cb(int ok, struct ofono_sim *sim = userdata; const char *path = __ofono_atom_get_path(sim->atom); DBusConnection *conn = ofono_dbus_get_connection(); - gboolean eflp_format = TRUE; + gboolean efli_format = TRUE; GSList *efli = NULL; GSList *efpl = NULL; @@ -1077,9 +1077,9 @@ static void sim_efpl_read_cb(int ok, skip_efpl: if (sim->efli && sim->efli_length > 0) { - eflp_format = sim_efli_format(sim->efli, sim->efli_length); + efli_format = sim_efli_format(sim->efli, sim->efli_length); - if (eflp_format) + if (efli_format) efli = parse_language_list(sim->efli, sim->efli_length); else efli = parse_eflp(sim->efli, sim->efli_length); @@ -1096,7 +1096,7 @@ skip_efpl: * preference to the EFPL at the MF unless... * Otherwise in order of preference according to TS 51.011 */ - if (eflp_format) + if (efli_format) sim->language_prefs = concat_lang_prefs(efli, efpl); else sim->language_prefs = concat_lang_prefs(efpl, efli); -- 1.6.1
_______________________________________________ ofono mailing list [email protected] http://lists.ofono.org/listinfo/ofono
