diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2022-02-24 11:22:38 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2022-02-26 23:10:21 +0100 |
| commit | 38012d9ba40cccbbfdcd1475312b05b2492067b0 (patch) | |
| tree | e8e2015f64dc980d17fda1c85d5f7c5c1d1abc0b | |
| parent | 2605831abfc6cd4c4ac64b6648c330efbbeab1a8 (diff) | |
| download | libqmi-38012d9ba40cccbbfdcd1475312b05b2492067b0.tar.gz | |
qmicli,uim: use the new Other Slots getter without array of arrays
| -rw-r--r-- | src/qmicli/qmicli-uim.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/qmicli/qmicli-uim.c b/src/qmicli/qmicli-uim.c index 851d4ab4..41137186 100644 --- a/src/qmicli/qmicli-uim.c +++ b/src/qmicli/qmicli-uim.c @@ -2443,7 +2443,7 @@ get_configuration_ready (QmiClientUim *client, g_print ("Configuration successfully retrieved\n"); /* Other slots TLV contains info for slots > 1 */ - qmi_message_uim_get_configuration_output_get_personalization_status_other_slots (output, &other_slots, NULL); + qmi_message_uim_get_configuration_output_get_personalization_status_other (output, &other_slots, NULL); if (qmi_message_uim_get_configuration_output_get_personalization_status (output, &elements, NULL)) { if (elements->len == 0) @@ -2473,20 +2473,22 @@ get_configuration_ready (QmiClientUim *client, if (other_slots->len == 0) g_print ("Personalization features in other slots: all disabled\n"); else { - guint slot; + guint i_slot; - for (slot = 0; slot < other_slots->len; slot++) { - QmiMessageUimGetConfigurationOutputPersonalizationStatusElement *element; + for (i_slot = 0; i_slot < other_slots->len; i_slot++) { + QmiMessageUimGetConfigurationOutputPersonalizationStatusOtherElement *slot_element; guint i; - elements = g_array_index (other_slots, GArray *, slot); - if (!elements) + slot_element = &g_array_index (other_slots, QmiMessageUimGetConfigurationOutputPersonalizationStatusOtherElement, i_slot); + if (!slot_element->slot) continue; - g_print ("Personalization features in slot %u:\n", slot + 2); - for (i = 0; i < elements->len; i++) { - element = &g_array_index (elements, - QmiMessageUimGetConfigurationOutputPersonalizationStatusElement, + g_print ("Personalization features in slot %u:\n", i_slot + 2); + for (i = 0; i < slot_element->slot->len; i++) { + QmiMessageUimGetConfigurationOutputPersonalizationStatusOtherElementSlotElement *element; + + element = &g_array_index (slot_element->slot, + QmiMessageUimGetConfigurationOutputPersonalizationStatusOtherElementSlotElement, i); g_print ("\tPersonalization: %s\n" "\t\tVerify left: %u\n" |