libdect: name transaction related functions more consistently

Signed-off-by: Patrick McHardy <kaber@trash.net>

4 files changed, 28 insertions, 28 deletions

diff --git a/src/cc.c b/src/cc.c
index f4302e5..91bbdd4 100644
--- a/src/cc.c
+++ b/src/cc.c
@@ -510,7 +510,7 @@ static void dect_cc_setup_timer(struct dect_handle *dh, struct dect_timer *timer
 	dh->ops->cc_ops->mncc_reject_ind(dh, call, param);
 	dect_ie_collection_put(dh, param);
 out:
-	dect_close_transaction(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
 	dect_call_destroy(dh, call);
 }
 
@@ -564,7 +564,7 @@ int dect_mncc_setup_req(struct dect_handle *dh, struct dect_call *call,
 	};
 
 	cc_debug_entry(call, "MNCC_SETUP-req");
-	if (dect_open_transaction(dh, &call->transaction, ipui, DECT_PD_CC) < 0)
+	if (dect_transaction_open(dh, &call->transaction, ipui, DECT_PD_CC) < 0)
 		goto err1;
 
 	fixed_identity.type = DECT_FIXED_ID_TYPE_PARK;
@@ -582,7 +582,7 @@ int dect_mncc_setup_req(struct dect_handle *dh, struct dect_call *call,
 	return 0;
 
 err2:
-	dect_close_transaction(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
 err1:
 	return -1;
 }
@@ -658,7 +658,7 @@ int dect_mncc_reject_req(struct dect_handle *dh, struct dect_call *call,
 	dect_cc_send_msg(dh, call, &cc_release_com_msg_desc,
 			 &msg.common, CC_RELEASE_COM);
 
-	dect_close_transaction(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
 	dect_call_destroy(dh, call);
 	return 0;
 }
@@ -862,7 +862,7 @@ int dect_mncc_release_res(struct dect_handle *dh, struct dect_call *call,
 			 &msg.common, CC_RELEASE_COM);
 
 	dect_call_disconnect_uplane(dh, call);
-	dect_close_transaction(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
 	dect_call_destroy(dh, call);
 	return 0;
 }
@@ -1342,7 +1342,7 @@ out:
 	dect_msg_free(dh, &cc_release_com_msg_desc, &msg.common);
 
 	dect_call_disconnect_uplane(dh, call);
-	dect_close_transaction(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
 	dect_call_destroy(dh, call);
 }
 
@@ -1547,7 +1547,7 @@ static void dect_cc_rcv_setup(struct dect_handle *dh,
 	call->ft_id = dect_ie_hold(msg.fixed_identity);
 	call->pt_id = dect_ie_hold(msg.portable_identity);
 	call->state = DECT_CC_CALL_INITIATED;
-	dect_confirm_transaction(dh, &call->transaction, req);
+	dect_transaction_confirm(dh, &call->transaction, req);
 	cc_debug(call, "new call");
 
 	dect_mncc_setup_ind(dh, call, &msg);
@@ -1579,7 +1579,7 @@ static void dect_cc_shutdown(struct dect_handle *dh,
 
 	cc_debug(call, "shutdown");
 	dh->ops->cc_ops->mncc_reject_ind(dh, call, NULL);
-	dect_close_transaction(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL);
 	dect_call_destroy(dh, call);
 }
 
diff --git a/src/lce.c b/src/lce.c
index a5ceb70..15323de 100644
--- a/src/lce.c
+++ b/src/lce.c
@@ -710,7 +710,7 @@ static void dect_lce_data_link_event(struct dect_handle *dh,
 		 */
 		if (dh->page_transaction.state == DECT_TRANSACTION_OPEN) {
 			dect_debug(DECT_DEBUG_LCE, "\n");
-			dect_close_transaction(dh, &dh->page_transaction,
+			dect_transaction_close(dh, &dh->page_transaction,
 					       DECT_RELEASE_NORMAL);
 		}
 	}
@@ -926,7 +926,7 @@ static void dect_lce_send_page_response(struct dect_handle *dh)
 	fixed_identity.type    = DECT_FIXED_ID_TYPE_PARK;
 	fixed_identity.ari     = dh->pari;
 
-	if (dect_open_transaction(dh, &dh->page_transaction, &dh->ipui,
+	if (dect_transaction_open(dh, &dh->page_transaction, &dh->ipui,
 				  DECT_PD_LCE) < 0)
 		return;
 
@@ -1033,7 +1033,7 @@ static void dect_lce_shutdown(struct dect_handle *dh,
 			      struct dect_transaction *ta)
 {
 	lce_debug("shutdown page transaction");
-	dect_close_transaction(dh, ta, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, ta, DECT_DDL_RELEASE_NORMAL);
 }
 
 static const struct dect_nwk_protocol lce_protocol = {
@@ -1063,7 +1063,7 @@ static int dect_transaction_alloc_tv(const struct dect_data_link *ddl,
 	return -1;
 }
 
-int dect_ddl_open_transaction(struct dect_handle *dh, struct dect_transaction *ta,
+int dect_ddl_transaction_open(struct dect_handle *dh, struct dect_transaction *ta,
 			      struct dect_data_link *ddl, enum dect_pds pd)
 {
 	const struct dect_nwk_protocol *protocol = protocols[pd];
@@ -1084,7 +1084,7 @@ int dect_ddl_open_transaction(struct dect_handle *dh, struct dect_transaction *t
 	return 0;
 }
 
-int dect_open_transaction(struct dect_handle *dh, struct dect_transaction *ta,
+int dect_transaction_open(struct dect_handle *dh, struct dect_transaction *ta,
 			  const struct dect_ipui *ipui, enum dect_pds pd)
 {
 	struct dect_data_link *ddl;
@@ -1093,10 +1093,10 @@ int dect_open_transaction(struct dect_handle *dh, struct dect_transaction *ta,
 	if (ddl == NULL)
 		return -1;
 
-	return dect_ddl_open_transaction(dh, ta, ddl, pd);
+	return dect_ddl_transaction_open(dh, ta, ddl, pd);
 }
 
-void dect_confirm_transaction(struct dect_handle *dh, struct dect_transaction *ta,
+void dect_transaction_confirm(struct dect_handle *dh, struct dect_transaction *ta,
 			      const struct dect_transaction *req)
 {
 	ta->link  = req->link;
@@ -1110,7 +1110,7 @@ void dect_confirm_transaction(struct dect_handle *dh, struct dect_transaction *t
 	list_add_tail(&ta->list, &req->link->transactions);
 }
 
-void dect_close_transaction(struct dect_handle *dh, struct dect_transaction *ta,
+void dect_transaction_close(struct dect_handle *dh, struct dect_transaction *ta,
 			    enum dect_release_modes mode)
 {
 	struct dect_data_link *ddl = ta->link;
diff --git a/src/mm.c b/src/mm.c
index a16ac2b..09f5d71 100644
--- a/src/mm.c
+++ b/src/mm.c
@@ -388,7 +388,7 @@ static int dect_mm_procedure_initiate(struct dect_handle *dh,
 			dect_stop_timer(dh, mp->timer);
 		dect_mm_proc[mp->type].abort(dh, mme, mp);
 	} else {
-		err = dect_ddl_open_transaction(dh, &mp->transaction, mme->link, DECT_PD_MM);
+		err = dect_ddl_transaction_open(dh, &mp->transaction, mme->link, DECT_PD_MM);
 		if (err < 0)
 			return err;
 	}
@@ -443,7 +443,7 @@ static void dect_mm_procedure_complete(struct dect_handle *dh,
 	if (mp->iec != NULL)
 		__dect_ie_collection_put(dh, mp->iec);
 
-	dect_close_transaction(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
+	dect_transaction_close(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
 	mp->type = DECT_MMP_NONE;
 
 	if (mme->procedure[!mme->current->role].type != DECT_MMP_NONE)
@@ -2113,7 +2113,7 @@ static void dect_mm_rcv_detach(struct dect_handle *dh,
 	param->iwu_to_iwu		= dect_ie_hold(msg.iwu_to_iwu);
 	param->escape_to_proprietary	= dect_ie_hold(msg.escape_to_proprietary);
 
-	dect_close_transaction(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
+	dect_transaction_close(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
 
 	mm_debug(mme, "MM_DETACH-ind");
 	dh->ops->mm_ops->mm_detach_ind(dh, mme, param);
@@ -2831,7 +2831,7 @@ static void dect_mm_rcv_info_suggest(struct dect_handle *dh,
 	param->iwu_to_iwu		= dect_ie_hold(msg.iwu_to_iwu);
 	param->escape_to_proprietary	= dect_ie_hold(msg.escape_to_proprietary);
 
-	dect_close_transaction(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
+	dect_transaction_close(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
 
 	mm_debug(mme, "MM_INFO-ind");
 	dh->ops->mm_ops->mm_info_ind(dh, mme, param);
@@ -2868,7 +2868,7 @@ int dect_mm_iwu_req(struct dect_handle *dh, struct dect_mm_endpoint *mme,
 	if (mp->type != DECT_MMP_NONE)
 		return -1;
 
-	err = dect_ddl_open_transaction(dh, &mp->transaction, mme->link,
+	err = dect_ddl_transaction_open(dh, &mp->transaction, mme->link,
 					DECT_PD_MM);
 	if (err < 0)
 		goto err1;
@@ -2881,7 +2881,7 @@ int dect_mm_iwu_req(struct dect_handle *dh, struct dect_mm_endpoint *mme,
 	err = dect_mm_send_msg(dh, mp, &mm_iwu_msg_desc,
 			       &msg.common, DECT_MM_IWU);
 
-	dect_close_transaction(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
+	dect_transaction_close(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
 err1:
 	return err;
 }
@@ -2910,7 +2910,7 @@ static void dect_mm_rcv_iwu(struct dect_handle *dh,
 	param->iwu_packet		= dect_ie_hold(msg.iwu_packet);
 	param->escape_to_proprietary	= dect_ie_hold(msg.escape_to_proprietary);
 
-	dect_close_transaction(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
+	dect_transaction_close(dh, &mp->transaction, DECT_DDL_RELEASE_PARTIAL);
 
 	mm_debug(mme, "MM_IWU-ind");
 	dh->ops->mm_ops->mm_iwu_ind(dh, mme, param);
@@ -3128,7 +3128,7 @@ static void dect_mm_open(struct dect_handle *dh,
 	}
 
 	ta = &mme->procedure[DECT_TRANSACTION_RESPONDER].transaction;
-	dect_confirm_transaction(dh, ta, req);
+	dect_transaction_confirm(dh, ta, req);
 
 	switch (mb->type) {
 	case DECT_MM_AUTHENTICATION_REQUEST:
diff --git a/src/ss.c b/src/ss.c
index f10009d..9ac1764 100644
--- a/src/ss.c
+++ b/src/ss.c
@@ -139,7 +139,7 @@ int dect_mnss_setup_req(struct dect_handle *dh, struct dect_ss_endpoint *sse,
 	};
 
 	ss_debug_entry(sse, "MNSS_SETUP-req");
-	if (dect_open_transaction(dh, &sse->transaction, ipui, DECT_PD_CISS) < 0)
+	if (dect_transaction_open(dh, &sse->transaction, ipui, DECT_PD_CISS) < 0)
 		goto err1;
 
 	if (dh->mode == DECT_MODE_PP) {
@@ -154,7 +154,7 @@ int dect_mnss_setup_req(struct dect_handle *dh, struct dect_ss_endpoint *sse,
 	return 0;
 
 err2:
-	dect_close_transaction(dh, &sse->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &sse->transaction, DECT_DDL_RELEASE_NORMAL);
 err1:
 	return -1;
 }
@@ -308,7 +308,7 @@ static void dect_ciss_rcv_register(struct dect_handle *dh,
 	param->feature_indicate		= dect_ie_hold(msg.feature_indicate);
 	param->escape_to_proprietary	= dect_ie_hold(msg.escape_to_proprietary);
 
-	dect_confirm_transaction(dh, &sse->transaction, req);
+	dect_transaction_confirm(dh, &sse->transaction, req);
 
 	ss_debug(sse, "MNSS_SETUP-ind");
 	dh->ops->ss_ops->mnss_setup_ind(dh, sse, param);
@@ -336,7 +336,7 @@ static void dect_ciss_shutdown(struct dect_handle *dh,
 	struct dect_ss_endpoint *sse = dect_ss_endpoint(ta);
 
 	ss_debug(sse, "shutdown");
-	dect_close_transaction(dh, &sse->transaction, DECT_DDL_RELEASE_NORMAL);
+	dect_transaction_close(dh, &sse->transaction, DECT_DDL_RELEASE_NORMAL);
 }
 
 static const struct dect_nwk_protocol ciss_protocol = {