sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

sim: Compact all booleans into the bitfield

This commit is contained in:
Denis Kenzior 2017-10-30 12:31:58 -05:00
parent ec3a59afb6
commit 57e0b26f22
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/sim.c
View File

@ -74,7 +74,6 @@ struct ofono_sim {
char **language_prefs;
unsigned char *efli;
unsigned char efli_length;
gboolean language_prefs_update;
enum ofono_sim_password_type pin_type;
gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */
@ -91,8 +90,6 @@ struct ofono_sim {
unsigned char efest_length;
unsigned char *efsst;
unsigned char efsst_length;
gboolean fixed_dialing;
gboolean barred_dialing;
char *imsi;
char mcc[OFONO_MAX_MCC_LENGTH + 1];
@ -104,7 +101,6 @@ struct ofono_sim {
unsigned char efmsisdn_records;
GSList *service_numbers;
gboolean sdn_ready;
unsigned char *efimg;
unsigned short efimg_length;
@ -138,6 +134,10 @@ struct ofono_sim {
GSList *aid_list;
char *impi;
bool reading_spn : 1;
bool language_prefs_update : 1;
bool fixed_dialing : 1;
bool barred_dialing : 1;
bool sdn_ready : 1;
};
struct msisdn_set_request {
@ -1306,7 +1306,7 @@ check:
/* All records retrieved */
if (sim->service_numbers) {
sim->service_numbers = g_slist_reverse(sim->service_numbers);
sim->sdn_ready = TRUE;
sim->sdn_ready = true;
}
if (sim->sdn_ready) {
@ -1645,7 +1645,7 @@ static void sim_fdn_enabled(struct ofono_sim *sim)
const char *path = __ofono_atom_get_path(sim->atom);
dbus_bool_t val;
sim->fixed_dialing = TRUE;
sim->fixed_dialing = true;
val = sim->fixed_dialing;
ofono_dbus_signal_property_changed(conn, path,
@ -1682,8 +1682,7 @@ static void sim_efbdn_info_read_cb(int ok, unsigned char file_status,
sim_bdn_enabled(sim);
out:
if (sim->fixed_dialing != TRUE &&
sim->barred_dialing != TRUE)
if (!sim->fixed_dialing && !sim->barred_dialing)
sim_retrieve_imsi(sim);
}
@ -1720,8 +1719,7 @@ static void sim_efadn_info_read_cb(int ok, unsigned char file_status,
out:
if (check_bdn_status(sim) != TRUE) {
if (sim->fixed_dialing != TRUE &&
sim->barred_dialing != TRUE)
if (!sim->fixed_dialing && !sim->barred_dialing)
sim_retrieve_imsi(sim);
}
}
@ -1805,8 +1803,7 @@ static void sim_efest_read_cb(int ok, int length, int record,
sim_bdn_enabled(sim);
out:
if (sim->fixed_dialing != TRUE &&
sim->barred_dialing != TRUE)
if (!sim->fixed_dialing && !sim->barred_dialing)
sim_retrieve_imsi(sim);
}
@ -2143,7 +2140,7 @@ skip_efpl:
if (!sim->language_prefs_update)
__ofono_sim_recheck_pin(sim);
sim->language_prefs_update = FALSE;
sim->language_prefs_update = false;
}
static void sim_iccid_read_cb(int ok, int length, int record,
@ -2195,7 +2192,7 @@ static void sim_efli_efpl_changed(int id, void *userdata)
sim->language_prefs = NULL;
}
sim->language_prefs_update = TRUE;
sim->language_prefs_update = true;
ofono_sim_read(sim->early_context, SIM_EFLI_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
@ -2533,7 +2530,7 @@ static void sim_free_main_state(struct ofono_sim *sim)
if (sim->service_numbers) {
g_slist_free_full(sim->service_numbers, service_number_free);
sim->service_numbers = NULL;
sim->sdn_ready = FALSE;
sim->sdn_ready = false;
}
if (sim->efust) {
@ -2570,8 +2567,8 @@ static void sim_free_main_state(struct ofono_sim *sim)
g_free(sim->iidf_image);
sim->iidf_image = NULL;
sim->fixed_dialing = FALSE;
sim->barred_dialing = FALSE;
sim->fixed_dialing = false;
sim->barred_dialing = false;
sim_spn_close(sim);