colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared-qmi: use the new QmiSlotEidElement type

Browse Source 
This type was introduced to avoid having GArrays of GArrays in libqmi.
This commit is contained in:
Aleksander Morgado
2022-02-28 21:42:49 +01:00
parent a21b7740d8
commit 18aa526f8c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mm-shared-qmi.c
View File

@@ -3316,7 +3316,7 @@ uim_get_slot_status_ready (QmiClientUim *client,
/* It's fine if we don't have EID information, but it should be well-formed if present. If it's malformed, /* It's fine if we don't have EID information, but it should be well-formed if present. If it's malformed,
* there is probably a modem firmware bug. */ * there is probably a modem firmware bug. */
if (qmi_message_uim_get_slot_status_output_get_physical_slot_information (output, &ext_information, NULL) && if (qmi_message_uim_get_slot_status_output_get_physical_slot_information (output, &ext_information, NULL) &&
qmi_message_uim_get_slot_status_output_get_slot_eid_information (output, &slot_eids, NULL) && qmi_message_uim_get_slot_status_output_get_slot_eid (output, &slot_eids, NULL) &&
(ext_information->len != physical_slots->len || slot_eids->len != physical_slots->len)) { (ext_information->len != physical_slots->len || slot_eids->len != physical_slots->len)) {
g_task_return_new_error (task, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
@@ -3372,11 +3372,11 @@ uim_get_slot_status_ready (QmiClientUim *client,
if (ext_information && slot_eids) { if (ext_information && slot_eids) {
slot_info = &g_array_index (ext_information, QmiPhysicalSlotInformationSlot, i); slot_info = &g_array_index (ext_information, QmiPhysicalSlotInformationSlot, i);
if (slot_info->is_euicc) { if (slot_info->is_euicc) {
GArray *slot_eid; QmiSlotEidElement *slot_eid_element;
slot_eid = g_array_index (slot_eids, GArray *, i); slot_eid_element = &g_array_index (slot_eids, QmiSlotEidElement, i);
if (slot_eid->len) if (slot_eid_element->eid->len)
eid = mm_decode_eid (slot_eid->data, slot_eid->len); eid = mm_decode_eid (slot_eid_element->eid->data, slot_eid_element->eid->len);
if (!eid) if (!eid)
mm_obj_dbg (self, "SIM in slot %d is marked as eUICC, but has malformed EID", i + 1); mm_obj_dbg (self, "SIM in slot %d is marked as eUICC, but has malformed EID", i + 1);
} }