summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-06-21 14:39:31 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-06-21 15:50:03 +0200
commit73b77e19b2e442fffd8c1da1630cf668e068a99a (patch)
tree8dc8ee39cd474ac7bbd5ef83eb4f158a7377c678
parent59559b41564fa0360c9ada2db200f0bfa346024d (diff)
downloadhardware_replicant_libsamsung-ril-73b77e19b2e442fffd8c1da1630cf668e068a99a.tar.gz
hardware_replicant_libsamsung-ril-73b77e19b2e442fffd8c1da1630cf668e068a99a.tar.bz2
hardware_replicant_libsamsung-ril-73b77e19b2e442fffd8c1da1630cf668e068a99a.zip
ril_has_reached_state: use more meaningful variable names
This improves clarity. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--samsung-ril.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/samsung-ril.c b/samsung-ril.c
index 349974b..376f4e3 100644
--- a/samsung-ril.c
+++ b/samsung-ril.c
@@ -1200,7 +1200,7 @@ int ril_radio_state_update(RIL_RadioState radio_state)
* Returns 0 if the ril has reached the given radio_state
* Returns -1 otherwise
*/
-int ril_has_reached_state(RIL_RadioState radio_state)
+int ril_has_reached_state(RIL_RadioState given_state)
{
RIL_RadioState radio_states[] = {
RADIO_STATE_UNAVAILABLE,
@@ -1212,26 +1212,31 @@ int ril_has_reached_state(RIL_RadioState radio_state)
RADIO_STATE_SIM_LOCKED_OR_ABSENT,
RADIO_STATE_SIM_READY,
};
- unsigned int index;
- unsigned int count;
+
+ RIL_RadioState curr_state;
+
+ unsigned int curr_state_index;
+ unsigned int given_state_index;
+ unsigned int radio_states_count;
unsigned int i;
if (ril_data == NULL)
return -1;
- count = sizeof(radio_states) / sizeof(RIL_RadioState);
+ curr_state = ril_data->radio_state;
+ radio_states_count = sizeof(radio_states) / sizeof(RIL_RadioState);
- for (i = 0; i < count; i++)
- if (radio_states[i] == radio_state)
+ for (i = 0; i < radio_states_count; i++)
+ if (radio_states[i] == given_state)
break;
+ given_state_index = i;
- index = i;
-
- for (i = 0; i < count; i++)
- if (radio_states[i] == ril_data->radio_state)
+ for (i = 0; i < radio_states_count; i++)
+ if (radio_states[i] == curr_state)
break;
+ curr_state_index = i;
- if (i < index)
+ if (curr_state_index < given_state_index)
return -1;
return 0;