[Replicant] [libsamsung-ril] [PATCH 3/5] Adjust to libsamsung-ipc ipc_sec_lock_infomation_response_data typo fix

Denis 'GNUtoo' Carikli GNUtoo at cyberdimension.org
Mon Jul 6 06:46:56 UTC 2020


In libsamsung-ipc, ipc_sec_lock_infomation_response_data was changed to
ipc_sec_lock_information_response_data as the former seems to be a typo.

This change was made by the following libsamsung-ipc commit:
    cae58ae626f4dad678567e03dcfa247e05f69ddc
    cae58ae Fix ipc_sec_lock_infomation_response_data typo

As ipc_sec_lock_infomation_response_data was used in libsamsung-ril too, we
need to do the change here too, as otherwise we will end with compilation
errors like that while compiling Replicant 6.0:
    hardware/replicant/libsamsung-ril/sim.c:
    In function 'ipc_sec_lock_infomation':
    hardware/replicant/libsamsung-ril/sim.c:1174:73:
    error: invalid application of 'sizeof' to incomplete type
    'struct ipc_sec_lock_infomation_response_data'
    if (message == NULL || message->data == NULL || message->size <
    sizeof(struct ipc_sec_lock_infomation_response_data))
           ^

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
 sim.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sim.c b/sim.c
index 12c313e..717b5ff 100644
--- a/sim.c
+++ b/sim.c
@@ -1161,7 +1161,7 @@ int ipc_sec_sim_icc_type(struct ipc_message *message)
 
 int ipc_sec_lock_infomation(struct ipc_message *message)
 {
-	struct ipc_sec_lock_infomation_response_data *data;
+	struct ipc_sec_lock_information_response_data *data;
 	struct ipc_gen_phone_res_data *gen_phone_res;
 	int requests[] = { RIL_REQUEST_ENTER_SIM_PIN, RIL_REQUEST_CHANGE_SIM_PIN, RIL_REQUEST_ENTER_SIM_PIN2, RIL_REQUEST_CHANGE_SIM_PIN2, RIL_REQUEST_SET_FACILITY_LOCK };
 	void *gen_phone_res_data = NULL;
@@ -1171,7 +1171,7 @@ int ipc_sec_lock_infomation(struct ipc_message *message)
 	unsigned int i;
 	int rc;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_sec_lock_infomation_response_data))
+	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_sec_lock_information_response_data))
 		return -1;
 
 	rc = ril_radio_state_check(RADIO_STATE_SIM_NOT_READY);
@@ -1181,7 +1181,7 @@ int ipc_sec_lock_infomation(struct ipc_message *message)
 	if (message->type != IPC_TYPE_RESP || !ipc_seq_valid(message->aseq))
 		return 0;
 
-	data = (struct ipc_sec_lock_infomation_response_data *) message->data;
+	data = (struct ipc_sec_lock_information_response_data *) message->data;
 	if (data->type != IPC_SEC_PIN_TYPE_PIN1 && data->type != IPC_SEC_PIN_TYPE_PIN2)
 		return 0;
 
-- 
2.27.0



More information about the Replicant mailing list