From 8a4df37e8338b9871abf0c81887e74b21c5ea851 Mon Sep 17 00:00:00 2001
From: Chieh-Chun Chen <chenc80348@gmail.com>
Date: Wed, 23 Aug 2023 16:48:21 +0200
Subject: [PATCH] nr rlc: rename delete() to delete_entity()

---
 openair2/LAYER2/nr_rlc/nr_rlc_entity.c     | 6 +++---
 openair2/LAYER2/nr_rlc/nr_rlc_entity.h     | 2 +-
 openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c    | 4 ++--
 openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity.c
index a27cf4f048..e9fa7e5a6e 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity.c
@@ -99,7 +99,7 @@ nr_rlc_entity_t *new_nr_rlc_entity_am(
   ret->common.set_time           = nr_rlc_entity_am_set_time;
   ret->common.discard_sdu        = nr_rlc_entity_am_discard_sdu;
   ret->common.reestablishment    = nr_rlc_entity_am_reestablishment;
-  ret->common.delete             = nr_rlc_entity_am_delete;
+  ret->common.delete_entity      = nr_rlc_entity_am_delete;
   ret->common.available_tx_space = nr_rlc_entity_am_available_tx_space;
   ret->common.get_stats       = nr_rlc_entity_get_stats;
 
@@ -158,7 +158,7 @@ nr_rlc_entity_t *new_nr_rlc_entity_um(
   ret->common.set_time           = nr_rlc_entity_um_set_time;
   ret->common.discard_sdu        = nr_rlc_entity_um_discard_sdu;
   ret->common.reestablishment    = nr_rlc_entity_um_reestablishment;
-  ret->common.delete             = nr_rlc_entity_um_delete;
+  ret->common.delete_entity      = nr_rlc_entity_um_delete;
   ret->common.available_tx_space = nr_rlc_entity_um_available_tx_space;
   ret->common.get_stats       = nr_rlc_entity_get_stats;
 
@@ -198,7 +198,7 @@ nr_rlc_entity_t *new_nr_rlc_entity_tm(
   ret->common.set_time           = nr_rlc_entity_tm_set_time;
   ret->common.discard_sdu        = nr_rlc_entity_tm_discard_sdu;
   ret->common.reestablishment    = nr_rlc_entity_tm_reestablishment;
-  ret->common.delete             = nr_rlc_entity_tm_delete;
+  ret->common.delete_entity      = nr_rlc_entity_tm_delete;
   ret->common.available_tx_space = nr_rlc_entity_tm_available_tx_space;
   ret->common.get_stats       = nr_rlc_entity_get_stats;
 
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity.h b/openair2/LAYER2/nr_rlc/nr_rlc_entity.h
index cd26094cf7..ec911e9217 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity.h
@@ -119,7 +119,7 @@ typedef struct nr_rlc_entity_t {
 
   void (*reestablishment)(struct nr_rlc_entity_t *entity);
 
-  void (*delete)(struct nr_rlc_entity_t *entity);
+  void (*delete_entity)(struct nr_rlc_entity_t *entity);
 
   int (*available_tx_space)(struct nr_rlc_entity_t *entity);
 
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index 7a2d3ae0a5..02c1c72fb7 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -917,13 +917,13 @@ rlc_op_status_t rrc_rlc_config_req   (
   ue = nr_rlc_manager_get_ue(nr_rlc_ue_manager, ctxt_pP->rntiMaybeUEid);
   if (srb_flagP) {
     if (ue->srb[rb_idP-1] != NULL) {
-      ue->srb[rb_idP-1]->delete(ue->srb[rb_idP-1]);
+      ue->srb[rb_idP-1]->delete_entity(ue->srb[rb_idP-1]);
       ue->srb[rb_idP-1] = NULL;
     } else
       LOG_W(RLC, "removing non allocated SRB %ld, do nothing\n", rb_idP);
   } else {
     if (ue->drb[rb_idP-1] != NULL) {
-      ue->drb[rb_idP-1]->delete(ue->drb[rb_idP-1]);
+      ue->drb[rb_idP-1]->delete_entity(ue->drb[rb_idP-1]);
       ue->drb[rb_idP-1] = NULL;
     } else
       LOG_W(RLC, "removing non allocated DRB %ld, do nothing\n", rb_idP);
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c b/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c
index c8113baf35..1770446c9e 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c
@@ -128,16 +128,16 @@ void nr_rlc_manager_remove_ue(nr_rlc_ue_manager_t *_m, int rnti)
   if (ue->srb0 != NULL) {
     /* deliver_sdu_data for srb0 is allocated, needs a free() */
     free(ue->srb0->deliver_sdu_data);
-    ue->srb0->delete(ue->srb0);
+    ue->srb0->delete_entity(ue->srb0);
   }
 
   for (j = 0; j < 3; j++)
     if (ue->srb[j] != NULL)
-      ue->srb[j]->delete(ue->srb[j]);
+      ue->srb[j]->delete_entity(ue->srb[j]);
 
   for (j = 0; j < MAX_DRBS_PER_UE; j++)
     if (ue->drb[j] != NULL)
-      ue->drb[j]->delete(ue->drb[j]);
+      ue->drb[j]->delete_entity(ue->drb[j]);
 
   free(ue);