[Replicant] [libsamsung-ril] [PATCH 10/23] data.c: break lines over 80 characters

Denis 'GNUtoo' Carikli GNUtoo at cyberdimension.org
Thu Mar 4 12:42:37 UTC 2021


Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
 data.c | 298 +++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 214 insertions(+), 84 deletions(-)

diff --git a/data.c b/data.c
index ff6df5e..e41a205 100644
--- a/data.c
+++ b/data.c
@@ -84,7 +84,8 @@ int ril_data_connection_register(unsigned int cid, char *apn, char *username,
 	if (apn == NULL || ril_data == NULL)
 		return -1;
 
-	data_connection = (struct ril_data_connection *) calloc(1, sizeof(struct ril_data_connection));
+	data_connection = (struct ril_data_connection *) calloc(
+		1, sizeof(struct ril_data_connection));
 	data_connection->cid = cid;
 	data_connection->enabled = 0;
 	data_connection->apn = apn;
@@ -114,7 +115,8 @@ int ril_data_connection_unregister(struct ril_data_connection *data_connection)
 	list = ril_data->data_connections;
 	while (list != NULL) {
 		if (list->data == (void *) data_connection) {
-			memset(data_connection, 0, sizeof(struct ril_data_connection));
+			memset(data_connection, 0,
+			       sizeof(struct ril_data_connection));
 			free(data_connection);
 
 			if (list == ril_data->data_connections)
@@ -143,11 +145,13 @@ int ril_data_connection_flush(void)
 	list = ril_data->data_connections;
 	while (list != NULL) {
 		if (list->data != NULL) {
-			data_connection = (struct ril_data_connection *) list->data;
+			data_connection =
+				(struct ril_data_connection *) list->data;
 
 			ril_data_connection_stop(data_connection);
 
-			memset(data_connection, 0, sizeof(struct ril_data_connection));
+			memset(data_connection, 0,
+			       sizeof(struct ril_data_connection));
 			free(data_connection);
 		}
 
@@ -237,7 +241,8 @@ struct ril_data_connection *ril_data_connection_start(char *apn, char *username,
 	if (ipc_fmt_data->ipc_client == NULL)
 		goto error;
 
-	rc = ipc_client_gprs_get_capabilities(ipc_fmt_data->ipc_client, &gprs_capabilities);
+	rc = ipc_client_gprs_get_capabilities(ipc_fmt_data->ipc_client,
+					      &gprs_capabilities);
 	if (rc < 0)
 		goto error;
 
@@ -250,7 +255,8 @@ struct ril_data_connection *ril_data_connection_start(char *apn, char *username,
 	cid = i + 1;
 
 	if (cid > gprs_capabilities.cid_count) {
-		RIL_LOGE("%s: No place left for a new data connection", __func__);
+		RIL_LOGE("%s: No place left for a new data connection",
+			 __func__);
 		goto error;
 	}
 
@@ -266,7 +272,8 @@ struct ril_data_connection *ril_data_connection_start(char *apn, char *username,
 	if (data_connection == NULL)
 		goto error;
 
-	RIL_LOGD("Starting new data connection with cid: %d and iface: %s", cid, iface);
+	RIL_LOGD("Starting new data connection with cid: %d and iface: %s", cid,
+		 iface);
 
 	goto complete;
 
@@ -332,7 +339,11 @@ int ril_data_connection_enable(struct ril_data_connection *data_connection)
 	in_addr_t dns2_addr;
 	int rc;
 
-	if (data_connection == NULL || data_connection->iface == NULL || data_connection->ip == NULL || data_connection->gateway == NULL || data_connection->subnet_mask == NULL)
+	if (data_connection == NULL ||
+	    data_connection->iface == NULL ||
+	    data_connection->ip == NULL ||
+	    data_connection->gateway == NULL ||
+	    data_connection->subnet_mask == NULL)
 		return -1;
 
 	client = ril_client_find_id(RIL_CLIENT_IPC_FMT);
@@ -343,7 +354,8 @@ int ril_data_connection_enable(struct ril_data_connection *data_connection)
 	if (ipc_fmt_data->ipc_client == NULL)
 		return -1;
 
-	rc = ipc_client_gprs_activate(ipc_fmt_data->ipc_client, data_connection->cid);
+	rc = ipc_client_gprs_activate(ipc_fmt_data->ipc_client,
+				      data_connection->cid);
 	if (rc < 0)
 		return -1;
 
@@ -361,13 +373,16 @@ int ril_data_connection_enable(struct ril_data_connection *data_connection)
 	else
 		dns2_addr = 0;
 
-	rc = ifc_configure(data_connection->iface, ip_addr, ipv4NetmaskToPrefixLength(subnet_mask_addr), gateway_addr, dns1_addr, dns2_addr);
+	rc = ifc_configure(data_connection->iface, ip_addr,
+			   ipv4NetmaskToPrefixLength(subnet_mask_addr),
+			   gateway_addr, dns1_addr, dns2_addr);
 	if (rc < 0)
 		return -1;
 
 	data_connection->enabled = 1;
 
-	RIL_LOGD("%s: Enabled data connection with cid %d", __func__, data_connection->cid);
+	RIL_LOGD("%s: Enabled data connection with cid %d",
+		 __func__, data_connection->cid);
 
 	return 0;
 }
@@ -389,7 +404,8 @@ int ril_data_connection_disable(struct ril_data_connection *data_connection)
 	if (ipc_fmt_data->ipc_client == NULL)
 		return -1;
 
-	rc = ifc_reset_connections(data_connection->iface, RESET_IPV4_ADDRESSES);
+	rc = ifc_reset_connections(data_connection->iface,
+				   RESET_IPV4_ADDRESSES);
 	if (rc < 0)
 		return -1;
 
@@ -397,13 +413,15 @@ int ril_data_connection_disable(struct ril_data_connection *data_connection)
 	if (rc < 0)
 		return -1;
 
-	rc = ipc_client_gprs_deactivate(ipc_fmt_data->ipc_client, data_connection->cid);
+	rc = ipc_client_gprs_deactivate(ipc_fmt_data->ipc_client,
+					data_connection->cid);
 	if (rc < 0)
 		return -1;
 
 	data_connection->enabled = 0;
 
-	RIL_LOGD("%s: Disabled data connection with cid %d", __func__, data_connection->cid);
+	RIL_LOGD("%s: Disabled data connection with cid %d",
+		 __func__, data_connection->cid);
 
 	return 0;;
 }
@@ -415,14 +433,17 @@ int ipc_gprs_define_pdp_context_callback(struct ipc_message *message)
 	struct ipc_gen_phone_res_data *data;
 	int rc;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gen_phone_res_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(struct ipc_gen_phone_res_data))
 		return -1;
 
 	data = (struct ipc_gen_phone_res_data *) message->data;
 
-	data_connection = ril_data_connection_find_token(ipc_fmt_request_token(message->aseq));
+	data_connection = ril_data_connection_find_token(
+		ipc_fmt_request_token(message->aseq));
 	if (data_connection == NULL) {
-		ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_GENERIC_FAILURE, NULL, 0);
+		ril_request_complete(ipc_fmt_request_token(message->aseq),
+				     RIL_E_GENERIC_FAILURE, NULL, 0);
 		return 0;
 	}
 
@@ -430,15 +451,25 @@ int ipc_gprs_define_pdp_context_callback(struct ipc_message *message)
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_gprs_pdp_context_request_set_setup(&request_data, 1, data_connection->cid, data_connection->username, data_connection->password);
+	rc = ipc_gprs_pdp_context_request_set_setup(&request_data,
+						    1,
+						    data_connection->cid,
+						    data_connection->username,
+						    data_connection->password);
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_gen_phone_res_expect_callback(message->aseq, IPC_GPRS_PDP_CONTEXT, ipc_gprs_pdp_context_callback);
+	rc = ipc_gen_phone_res_expect_callback(message->aseq,
+					       IPC_GPRS_PDP_CONTEXT,
+					       ipc_gprs_pdp_context_callback);
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_fmt_send(message->aseq, IPC_GPRS_PDP_CONTEXT, IPC_TYPE_SET, (void *) &request_data, sizeof(request_data));
+	rc = ipc_fmt_send(message->aseq,
+			  IPC_GPRS_PDP_CONTEXT,
+			  IPC_TYPE_SET,
+			  (void *) &request_data,
+			  sizeof(request_data));
 	if (rc < 0)
 		goto error;
 
@@ -447,7 +478,10 @@ int ipc_gprs_define_pdp_context_callback(struct ipc_message *message)
 error:
 	ril_data_connection_stop(data_connection);
 
-	ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_GENERIC_FAILURE, NULL, 0);
+	ril_request_complete(ipc_fmt_request_token(message->aseq),
+			     RIL_E_GENERIC_FAILURE,
+			     NULL,
+			     0);
 
 complete:
 	return 0;
@@ -469,11 +503,15 @@ int ril_request_setup_data_call(void *data, size_t size, RIL_Token token)
 
 	rc = ril_sim_has_reached_state(SIM_STATE_READY);
 	if (rc < 0) {
-		ril_request_complete(token, RIL_E_OP_NOT_ALLOWED_BEFORE_REG_TO_NW, NULL, 0);
+		ril_request_complete(token,
+				     RIL_E_OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
+				     NULL,
+				     0);
 		return RIL_REQUEST_COMPLETED;
 	}
 
-	request = ril_request_find_request_status(RIL_REQUEST_SETUP_DATA_CALL, RIL_REQUEST_HANDLED);
+	request = ril_request_find_request_status(RIL_REQUEST_SETUP_DATA_CALL,
+						  RIL_REQUEST_HANDLED);
 	if (request != NULL)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -495,7 +533,9 @@ int ril_request_setup_data_call(void *data, size_t size, RIL_Token token)
 	strings_array_free(values, size);
 	values = NULL;
 
-	RIL_LOGD("Setting up data connection to APN: %s with username/password: %s/%s", apn, username, password);
+	RIL_LOGD("Setting up data connection to APN:"
+		 " %s with username/password: %s/%s",
+		 apn, username, password);
 
 	data_connection = ril_data_connection_start(apn, username, password);
 	if (data_connection == NULL)
@@ -503,15 +543,23 @@ int ril_request_setup_data_call(void *data, size_t size, RIL_Token token)
 
 	data_connection->token = token;
 
-	rc = ipc_gprs_define_pdp_context_setup(&request_data, 1, data_connection->cid, data_connection->apn);
+	rc = ipc_gprs_define_pdp_context_setup(&request_data, 1,
+					       data_connection->cid,
+					       data_connection->apn);
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_gen_phone_res_expect_callback(ipc_fmt_request_seq(token), IPC_GPRS_DEFINE_PDP_CONTEXT, ipc_gprs_define_pdp_context_callback);
+	rc = ipc_gen_phone_res_expect_callback(
+		ipc_fmt_request_seq(token),
+		IPC_GPRS_DEFINE_PDP_CONTEXT,
+		ipc_gprs_define_pdp_context_callback);
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_GPRS_DEFINE_PDP_CONTEXT, IPC_TYPE_SET, (void *) &request_data, sizeof(request_data));
+	rc = ipc_fmt_send(ipc_fmt_request_seq(token),
+			  IPC_GPRS_DEFINE_PDP_CONTEXT,
+			  IPC_TYPE_SET, (void *) &request_data,
+			  sizeof(request_data));
 	if (rc < 0)
 		goto error;
 
@@ -548,7 +596,8 @@ int ipc_gprs_ps(struct ipc_message *message)
 	struct ipc_gprs_ps_data *data;
 	struct ril_data_connection *data_connection;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gprs_ps_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(struct ipc_gprs_ps_data))
 		return -1;
 
 	data = (struct ipc_gprs_ps_data *) message->data;
@@ -572,12 +621,16 @@ int ipc_gprs_pdp_context(struct ipc_message *message)
 	size_t size;
 	unsigned int i;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gprs_pdp_context_request_get_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(
+		    struct ipc_gprs_pdp_context_request_get_data))
 		return -1;
 
 	data = (struct ipc_gprs_pdp_context_request_get_data *) message->data;
 
-	entries_count = sizeof(data->entries) / sizeof(struct ipc_gprs_pdp_context_request_get_entry);
+	entries_count =
+		sizeof(data->entries) /
+		sizeof(struct ipc_gprs_pdp_context_request_get_entry);
 
 	memset(&response, 0, sizeof(response));
 
@@ -585,7 +638,8 @@ int ipc_gprs_pdp_context(struct ipc_message *message)
 		if (!data->entries[i].active)
 			continue;
 
-		data_connection = ril_data_connection_find_cid(data->entries[i].cid);
+		data_connection =
+			ril_data_connection_find_cid(data->entries[i].cid);
 		if (data_connection == NULL)
 			continue;
 
@@ -607,10 +661,12 @@ int ipc_gprs_pdp_context(struct ipc_message *message)
 		if (data_connection->ip != NULL)
 			response[index].addresses = strdup(data_connection->ip);
 
-		asprintf(&response[index].dnses, "%s %s", data_connection->dns1, data_connection->dns2);
+		asprintf(&response[index].dnses, "%s %s", data_connection->dns1,
+			 data_connection->dns2);
 
 		if (data_connection->gateway != NULL)
-			response[index].gateways = strdup(data_connection->gateway);
+			response[index].gateways = strdup(
+				data_connection->gateway);
 #else
 		if (data_connection->apn != NULL)
 			response[index].apn = strdup(data_connection->apn);
@@ -625,9 +681,11 @@ int ipc_gprs_pdp_context(struct ipc_message *message)
 	size = index * sizeof(RIL_Data_Call_Response_compat);
 
 	if (!ipc_seq_valid(message->aseq))
-		ril_request_unsolicited(RIL_UNSOL_DATA_CALL_LIST_CHANGED, &response, size);
+		ril_request_unsolicited(RIL_UNSOL_DATA_CALL_LIST_CHANGED,
+					&response, size);
 	else
-		ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_SUCCESS, &response, size);
+		ril_request_complete(ipc_fmt_request_token(message->aseq),
+				     RIL_E_SUCCESS, &response, size);
 
 	for (i = 0; i < index; i++) {
 		if (response[i].type != NULL)
@@ -669,7 +727,8 @@ int ril_request_data_call_list(__attribute__((unused)) void *data,
 		return RIL_REQUEST_COMPLETED;
 	}
 
-	rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_GPRS_PDP_CONTEXT, IPC_TYPE_GET, NULL, 0);
+	rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_GPRS_PDP_CONTEXT,
+			  IPC_TYPE_GET, NULL, 0);
 	if (rc < 0)
 		goto error;
 
@@ -691,14 +750,17 @@ int ipc_gprs_pdp_context_callback(struct ipc_message *message)
 	struct ipc_gen_phone_res_data *data;
 	int rc;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gen_phone_res_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(struct ipc_gen_phone_res_data))
 		return -1;
 
 	data = (struct ipc_gen_phone_res_data *) message->data;
 
-	data_connection = ril_data_connection_find_token(ipc_fmt_request_token(message->aseq));
+	data_connection = ril_data_connection_find_token(
+		ipc_fmt_request_token(message->aseq));
 	if (data_connection == NULL) {
-		ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_GENERIC_FAILURE, NULL, 0);
+		ril_request_complete(ipc_fmt_request_token(message->aseq),
+				     RIL_E_GENERIC_FAILURE, NULL, 0);
 		return 0;
 	}
 
@@ -711,7 +773,8 @@ int ipc_gprs_pdp_context_callback(struct ipc_message *message)
 error:
 	ril_data_connection_stop(data_connection);
 
-	ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_GENERIC_FAILURE, NULL, 0);
+	ril_request_complete(ipc_fmt_request_token(message->aseq),
+			     RIL_E_GENERIC_FAILURE, NULL, 0);
 
 complete:
 	return 0;
@@ -733,7 +796,8 @@ int ril_request_deactivate_data_call(void *data, size_t size, RIL_Token token)
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
-	request = ril_request_find_request_status(RIL_REQUEST_DEACTIVATE_DATA_CALL, RIL_REQUEST_HANDLED);
+	request = ril_request_find_request_status(
+		RIL_REQUEST_DEACTIVATE_DATA_CALL, RIL_REQUEST_HANDLED);
 	if (request != NULL)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -755,15 +819,22 @@ int ril_request_deactivate_data_call(void *data, size_t size, RIL_Token token)
 
 	data_connection->token = token;
 
-	rc = ipc_gprs_pdp_context_request_set_setup(&request_data, 0, data_connection->cid, NULL, NULL);
+	rc = ipc_gprs_pdp_context_request_set_setup(&request_data,
+						    0, data_connection->cid,
+						    NULL, NULL);
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_gen_phone_res_expect_callback(ipc_fmt_request_seq(token), IPC_GPRS_PDP_CONTEXT, ipc_gprs_pdp_context_callback);
+	rc = ipc_gen_phone_res_expect_callback(ipc_fmt_request_seq(token),
+					       IPC_GPRS_PDP_CONTEXT,
+					       ipc_gprs_pdp_context_callback);
 	if (rc < 0)
 		goto error;
 
-	rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_GPRS_PDP_CONTEXT, IPC_TYPE_SET, (void *) &request_data, sizeof(request_data));
+	rc = ipc_fmt_send(ipc_fmt_request_seq(token),
+			  IPC_GPRS_PDP_CONTEXT, IPC_TYPE_SET,
+			  (void *) &request_data,
+			  sizeof(request_data));
 	if (rc < 0)
 		goto error;
 
@@ -790,7 +861,8 @@ int ipc_gprs_ip_configuration(struct ipc_message *message)
 	struct ipc_gprs_ip_configuration_data *data;
 	struct ril_data_connection *data_connection;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gprs_ip_configuration_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(struct ipc_gprs_ip_configuration_data))
 		return -1;
 
 	data = (struct ipc_gprs_ip_configuration_data *) message->data;
@@ -798,7 +870,10 @@ int ipc_gprs_ip_configuration(struct ipc_message *message)
 	data_connection = ril_data_connection_find_cid(data->cid);
 	if (data_connection == NULL) {
 		if (ipc_seq_valid(message->aseq))
-			ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_GENERIC_FAILURE, NULL, 0);
+			ril_request_complete(
+				ipc_fmt_request_token(message->aseq),
+				RIL_E_GENERIC_FAILURE,
+				NULL, 0);
 
 		return 0;
 	}
@@ -806,12 +881,14 @@ int ipc_gprs_ip_configuration(struct ipc_message *message)
 	if (data_connection->ip != NULL)
 		free(data_connection->ip);
 
-	asprintf(&data_connection->ip, "%i.%i.%i.%i", data->ip[0], data->ip[1], data->ip[2], data->ip[3]);
+	asprintf(&data_connection->ip, "%i.%i.%i.%i",
+		 data->ip[0], data->ip[1], data->ip[2], data->ip[3]);
 
 	if (data_connection->gateway != NULL)
 		free(data_connection->gateway);
 
-	asprintf(&data_connection->gateway, "%i.%i.%i.%i", data->ip[0], data->ip[1], data->ip[2], data->ip[3]);
+	asprintf(&data_connection->gateway, "%i.%i.%i.%i",
+		 data->ip[0], data->ip[1], data->ip[2], data->ip[3]);
 
 	if (data_connection->subnet_mask != NULL)
 		free(data_connection->subnet_mask);
@@ -821,12 +898,14 @@ int ipc_gprs_ip_configuration(struct ipc_message *message)
 	if (data_connection->dns1 != NULL)
 		free(data_connection->dns1);
 
-	asprintf(&data_connection->dns1, "%i.%i.%i.%i", data->dns1[0], data->dns1[1], data->dns1[2], data->dns1[3]);
+	asprintf(&data_connection->dns1, "%i.%i.%i.%i",
+		 data->dns1[0], data->dns1[1], data->dns1[2], data->dns1[3]);
 
 	if (data_connection->dns2 != NULL)
 		free(data_connection->dns2);
 
-	asprintf(&data_connection->dns2, "%i.%i.%i.%i", data->dns2[0], data->dns2[1], data->dns2[2], data->dns2[3]);
+	asprintf(&data_connection->dns2, "%i.%i.%i.%i",
+		 data->dns2[0], data->dns2[1], data->dns2[2], data->dns2[3]);
 
 	return 0;
 }
@@ -837,7 +916,8 @@ int ipc_gprs_hsdpa_status(struct ipc_message *message)
 	struct ril_client *client;
 	struct ipc_fmt_data *ipc_fmt_data;
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gprs_hsdpa_status_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(struct ipc_gprs_hsdpa_status_data))
 		return -1;
 
 	client = ril_client_find_id(RIL_CLIENT_IPC_FMT);
@@ -852,9 +932,12 @@ int ipc_gprs_hsdpa_status(struct ipc_message *message)
 		ipc_fmt_data->hsdpa_status_data.status = data->status;
 
 #if RIL_VERSION >= 6
-		ril_request_unsolicited(RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, NULL, 0);
+		ril_request_unsolicited(
+			RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED,
+			NULL, 0);
 #else
-		ril_request_unsolicited(RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED, NULL, 0);
+		ril_request_unsolicited(
+			RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED, NULL, 0);
 #endif
 	}
 
@@ -873,7 +956,8 @@ int ipc_gprs_call_status(struct ipc_message *message)
 	unsigned int i;
 #endif
 
-	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gprs_call_status_data))
+	if (message == NULL || message->data == NULL ||
+	    message->size < sizeof(struct ipc_gprs_call_status_data))
 		return -1;
 
 	rc = ril_sim_has_reached_state(SIM_STATE_READY);
@@ -884,10 +968,14 @@ int ipc_gprs_call_status(struct ipc_message *message)
 
 	data_connection = ril_data_connection_find_cid(data->cid);
 	if (data_connection == NULL) {
-		RIL_LOGE("%s: Finding data connection with cid: %d failed", __func__, data->cid);
+		RIL_LOGE("%s: Finding data connection with cid: %d failed",
+			 __func__, data->cid);
 
 		if (ipc_seq_valid(message->aseq))
-			ril_request_complete(ipc_fmt_request_token(message->aseq), RIL_E_GENERIC_FAILURE, NULL, 0);
+			ril_request_complete(
+				ipc_fmt_request_token(message->aseq),
+				RIL_E_GENERIC_FAILURE,
+				NULL, 0);
 
 		return 0;
 	}
@@ -896,44 +984,61 @@ int ipc_gprs_call_status(struct ipc_message *message)
 
 	if (data->status == IPC_GPRS_STATUS_ENABLED) {
 		if (data_connection->enabled) {
-			if (request != NULL && request->request == RIL_REQUEST_DEACTIVATE_DATA_CALL)
+			if (request != NULL &&
+			    request->request ==
+			    RIL_REQUEST_DEACTIVATE_DATA_CALL)
 				goto error;
 			else
-				RIL_LOGD("%s: Data connection with cid %d is already enabled", __func__, data_connection->cid);
+				RIL_LOGD("%s: Data connection with cid %d"
+					 " is already enabled",
+					 __func__, data_connection->cid);
 		} else {
 			rc = ril_data_connection_enable(data_connection);
 			if (rc < 0)
 				goto error;
 
-			if (request != NULL && request->request == RIL_REQUEST_SETUP_DATA_CALL) {
+			if (request != NULL &&
+			    request->request == RIL_REQUEST_SETUP_DATA_CALL) {
 				memset(&response, 0, sizeof(response));
 #if RIL_VERSION >= 6
-				response.status = ipc2ril_gprs_fail_cause(data->fail_cause);
+				response.status =
+					ipc2ril_gprs_fail_cause(
+						data->fail_cause);
 				response.cid = data_connection->cid;
 				response.active = 2;
 				response.type = strdup("IP");
 
 				if (data_connection->iface != NULL)
-					response.ifname = strdup(data_connection->iface);
+					response.ifname =
+						strdup(data_connection->iface);
 
 				if (data_connection->ip != NULL)
-					response.addresses = strdup(data_connection->ip);
+					response.addresses =
+						strdup(data_connection->ip);
 
-				asprintf(&response.dnses, "%s %s", data_connection->dns1, data_connection->dns2);
+				asprintf(&response.dnses, "%s %s",
+					 data_connection->dns1,
+					 data_connection->dns2);
 
 				if (data_connection->gateway != NULL)
-					response.gateways = strdup(data_connection->gateway);
+					response.gateways = strdup(
+						data_connection->gateway);
 #else
-				asprintf(&response[0], "%d", gprs_connection->cid);
+				asprintf(&response[0], "%d",
+					 gprs_connection->cid);
 
 				if (data_connection->iface != NULL)
-					response[1] = strdup(data_connection->iface);
+					response[1] =
+						strdup(data_connection->iface);
 
 				if (data_connection->ip != NULL)
-					response[2] = strdup(data_connection->ip);
+					response[2] =
+						strdup(data_connection->ip);
 #endif
 
-				ril_request_complete(data_connection->token, RIL_E_SUCCESS, &response, sizeof(response));
+				ril_request_complete(data_connection->token,
+						     RIL_E_SUCCESS, &response,
+						     sizeof(response));
 				data_connection->token = NULL;
 
 #if RIL_VERSION >= 6
@@ -958,10 +1063,13 @@ int ipc_gprs_call_status(struct ipc_message *message)
 				}
 #endif
 			} else {
-				RIL_LOGD("%s: Data connection with cid: %d got unexpectedly enabled", __func__, data_connection->cid);
+				RIL_LOGD("%s: Data connection with cid:"
+					 " %d got unexpectedly enabled",
+					 __func__, data_connection->cid);
 			}
 		}
-	} else if (data->status == IPC_GPRS_STATUS_DISABLED || data->status == IPC_GPRS_STATUS_NOT_ENABLED) {
+	} else if (data->status == IPC_GPRS_STATUS_DISABLED ||
+		   data->status == IPC_GPRS_STATUS_NOT_ENABLED) {
 		if (data_connection->enabled) {
 			rc = ril_data_connection_disable(data_connection);
 			if (rc < 0)
@@ -969,33 +1077,51 @@ int ipc_gprs_call_status(struct ipc_message *message)
 
 			ril_data_connection_stop(data_connection);
 
-			if (request != NULL && request->request == RIL_REQUEST_DEACTIVATE_DATA_CALL)
-				ril_request_complete(request->token, RIL_E_SUCCESS, NULL, 0);
+			if (request != NULL &&
+			    request->request ==
+			    RIL_REQUEST_DEACTIVATE_DATA_CALL)
+				ril_request_complete(request->token,
+						     RIL_E_SUCCESS,
+						     NULL, 0);
 			else
-				RIL_LOGD("%s: Data connection with cid: %d got unexpectedly disabled", __func__, data->cid);
+				RIL_LOGD("%s: Data connection with cid:"
+					 " %d got unexpectedly disabled",
+					 __func__, data->cid);
 		} else {
-			if (request != NULL && request->request == RIL_REQUEST_SETUP_DATA_CALL) {
+			if (request != NULL &&
+			    request->request == RIL_REQUEST_SETUP_DATA_CALL) {
 #if RIL_VERSION >= 6
 				memset(&response, 0, sizeof(response));
-				response.status = ipc2ril_gprs_fail_cause(data->fail_cause);
+				response.status = ipc2ril_gprs_fail_cause(
+					data->fail_cause);
 
-				ril_request_complete(request->token, RIL_E_SUCCESS, (void *) &response, sizeof(response));
+				ril_request_complete(request->token,
+						     RIL_E_SUCCESS,
+						     (void *) &response,
+						     sizeof(response));
 				// Avoid completing the request twice
 				request = NULL;
 #else
-				fail_cause = ipc2ril_gprs_fail_cause(data->fail_cause);
+				fail_cause = ipc2ril_gprs_fail_cause(
+					data->fail_cause);
 
-				ril_request_data_set_uniq(RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE, (void *) &fail_cause, sizeof(fail_cause));
+				ril_request_data_set_uniq(
+					RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE,
+					(void *) &fail_cause,
+					sizeof(fail_cause));
 #endif
 				goto error;
 			} else {
-				RIL_LOGD("%s: Data connection with cid: %d is already disabled", __func__, data_connection->cid);
+				RIL_LOGD("%s: Data connection with cid: "
+					 "%d is already disabled",
+					 __func__, data_connection->cid);
 			}
 		}
 	}
 
 	if (request == NULL) {
-		rc = ipc_fmt_send(0, IPC_GPRS_PDP_CONTEXT, IPC_TYPE_GET, NULL, 0);
+		rc = ipc_fmt_send(0, IPC_GPRS_PDP_CONTEXT, IPC_TYPE_GET,
+				  NULL, 0);
 		if (rc < 0)
 			goto error;
 	}
@@ -1006,7 +1132,8 @@ error:
 	ril_data_connection_stop(data_connection);
 
 	if (request != NULL)
-		ril_request_complete(request->token, RIL_E_GENERIC_FAILURE, NULL, 0);
+		ril_request_complete(request->token, RIL_E_GENERIC_FAILURE,
+				     NULL, 0);
 
 complete:
 	return 0;
@@ -1025,8 +1152,10 @@ int ril_request_last_data_call_fail_cause(__attribute__((unused)) void *data,
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
-	fail_cause_size = ril_request_data_size_get(RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE);
-	fail_cause_data = ril_request_data_get(RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE);
+	fail_cause_size = ril_request_data_size_get(
+		RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE);
+	fail_cause_data = ril_request_data_get(
+		RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE);
 
 	if (fail_cause_data != NULL && fail_cause_size >= sizeof(int)) {
 		fail_cause = *((int *) fail_cause_data);
@@ -1035,7 +1164,8 @@ int ril_request_last_data_call_fail_cause(__attribute__((unused)) void *data,
 		fail_cause = PDP_FAIL_ERROR_UNSPECIFIED;
 	}
 
-	ril_request_complete(token, RIL_E_SUCCESS, (void *) &fail_cause, sizeof(fail_cause));
+	ril_request_complete(token, RIL_E_SUCCESS, (void *) &fail_cause,
+			     sizeof(fail_cause));
 
 	return RIL_REQUEST_COMPLETED;
 }
-- 
2.30.1



More information about the Replicant mailing list