X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_utl_clist.c;h=9a73cb1278e394c1e730f39f512530e5b5b70136;hb=97a2285207414a7948f5e1dfcb5318fa9507c123;hp=4cbec3c1d913e56cbcf6ea709800b8e58455b27e;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_utl_clist.c b/src/5gnrsch/rg_sch_utl_clist.c
index 4cbec3c1d..9a73cb127 100755
--- a/src/5gnrsch/rg_sch_utl_clist.c
+++ b/src/5gnrsch/rg_sch_utl_clist.c
@@ -29,18 +29,9 @@
 *********************************************************************21*/
   
 /* header include files (.h) */
-
-#include "envopt.h"        /* environment options */  
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
+#include "common_def.h"
 
 /* header/extern include files (.x) */
-  
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system services */
 #include "rg_sch_clist.x"      /* common functions */
 
 
@@ -60,23 +51,17 @@
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
-PUBLIC Void rgSCHRrCListInit
+Void rgSCHRrCListInit
 (
 RgSchRrCListCp *lCp                /* list control point */
 )
-#else 
-PUBLIC Void rgSCHRrCListInit(lCp)
-RgSchRrCListCp *lCp;               /* list control point */
-#endif
 {
-   TRC2(rgSCHRrCListInit);
    
    lCp->first = (RgSchRrCList *)NULLP;
    lCp->crnt  = (RgSchRrCList *)NULLP;
    lCp->count = 0;
 
-   RETVOID;
+   return;
 } /* end of rgSCHRrCListInit */
 
 /* LTE_ADV_FLAG_REMOVED_START */
@@ -91,22 +76,15 @@ RgSchRrCListCp *lCp;               /* list control point */
  * 
  *        File:  rr_clist.c
  */
-#ifdef ANSI
-PUBLIC Void rgSCHRrCListAdd2Crnt
+Void rgSCHRrCListAdd2Crnt
 (
- RgSchRrCListCp *lCp,               /* list control point */
- RgSchRrCList   *node               /* node to be added */
- )
-#else
-PUBLIC Void rgSCHRrCListAdd2Crnt(lCp, node)
-   RgSchRrCListCp *lCp;               /* list control point */
-   RgSchRrCList   *node;              /* node to be added */
-#endif
+RgSchRrCListCp *lCp,               /* list control point */
+RgSchRrCList   *node               /* node to be added */
+)
 {
-   TRC2(rgSCHRrCListAdd2Crnt);
 #ifdef ERRCHK
    if (lCp == (RgSchRrCListCp *)NULLP)
-      RETVOID;
+      return;
 #endif
 
    lCp->count++;
@@ -119,7 +97,7 @@ PUBLIC Void rgSCHRrCListAdd2Crnt(lCp, node)
 
       lCp->crnt = lCp->first;
 
-      RETVOID;
+      return;
    }
 
    node->next = lCp->crnt;
@@ -127,7 +105,7 @@ PUBLIC Void rgSCHRrCListAdd2Crnt(lCp, node)
    lCp->crnt->prev->next = node;
    lCp->crnt->prev = node;
 
-   RETVOID;
+   return;
 }
 /* LTE_ADV_FLAG_REMOVED_END */
 
@@ -144,23 +122,16 @@ PUBLIC Void rgSCHRrCListAdd2Crnt(lCp, node)
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
-PUBLIC Void rgSCHRrCListAdd2Tail
+Void rgSCHRrCListAdd2Tail
 (
 RgSchRrCListCp *lCp,               /* list control point */
 RgSchRrCList   *node               /* node to be added */
 )
-#else 
-PUBLIC Void rgSCHRrCListAdd2Tail(lCp, node)
-RgSchRrCListCp *lCp;               /* list control point */
-RgSchRrCList   *node;              /* node to be added */
-#endif
 {
-   TRC2(rgSCHRrCListAdd2Tail);
 
 #ifdef ERRCHK
    if (lCp == (RgSchRrCListCp *)NULLP)
-      RETVOID;
+      return;
 #endif
  
    lCp->count++;
@@ -173,7 +144,7 @@ RgSchRrCList   *node;              /* node to be added */
 
       lCp->crnt = lCp->first;
 
-      RETVOID;
+      return;
    }
 
    node->next = lCp->first;
@@ -181,7 +152,7 @@ RgSchRrCList   *node;              /* node to be added */
    lCp->first->prev->next = node;
    lCp->first->prev = node;
 
-   RETVOID;
+   return;
 } /* end of rgSCHRrCListAdd2Tail */
 
 /*
@@ -199,28 +170,21 @@ RgSchRrCList   *node;              /* node to be added */
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
-PUBLIC RgSchRrCList *rgSCHRrCListDelFrm
+RgSchRrCList *rgSCHRrCListDelFrm
 (
 RgSchRrCListCp *lCp,                /* list control pointer */
 RgSchRrCList *node                  /* node to be removed */
 )
-#else 
-PUBLIC RgSchRrCList *rgSCHRrCListDelFrm(lCp, node)
-RgSchRrCListCp *lCp;               /* list control pointer */
-RgSchRrCList *node;                /* node to be removed */
-#endif
 {
-   TRC2(rgSCHRrCListDelFrm);
   
 #ifdef ERRCHK
    if (lCp == (RgSchRrCListCp *)NULLP)
-      RETVALUE(NULLP);
+      return (NULLP);
 #endif
 
    if(lCp->count == 0)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
    if (lCp->count == 1)
    {
@@ -229,9 +193,9 @@ RgSchRrCList *node;                /* node to be removed */
          lCp->first = lCp->crnt = (RgSchRrCList *)NULLP;
          lCp->count = 0;
          node->next = node->prev = (RgSchRrCList *)NULLP;
-         RETVALUE(node);
+         return (node);
       }
-      RETVALUE(NULLP);
+      return (NULLP);
    }
    
    if (lCp->first == node)
@@ -247,7 +211,7 @@ RgSchRrCList *node;                /* node to be removed */
        /* Adding this check and guarding the decrement of counter when
        node is deleted with reshuffling */
       lCp->count--;
-      RETVALUE(node);
+      return (node);
    }
 
    if(node->prev && node->next)
@@ -261,7 +225,7 @@ RgSchRrCList *node;                /* node to be removed */
       lCp->crnt = node->next;
    }
    node->next = node->prev = (RgSchRrCList *)NULLP;
-   RETVALUE(node);
+   return (node);
 } /* end of rgSCHRrCListDelFrm */
 
 /*
@@ -278,24 +242,17 @@ RgSchRrCList *node;                /* node to be removed */
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
-PUBLIC Void rgSCHRrCListInsrtAtCrnt
+Void rgSCHRrCListInsrtAtCrnt
 (
 RgSchRrCListCp *lCp,                /* list control pointer */
 RgSchRrCList *node                  /* node to be removed */
 )
-#else 
-PUBLIC Void rgSCHRrCListInsrtAtCrnt(lCp, node)
-RgSchRrCListCp *lCp;               /* list control pointer */
-RgSchRrCList *node;                /* node to be inserted */
-#endif
 {
    RgSchRrCList *crnt;
-   TRC2(rgSCHRrCListInsrtAtCrnt);
 
 #ifdef ERRCHK
    if (lCp == (RgSchRrCListCp *)NULLP)
-      RETVOID;
+      return;
 #endif
 
    crnt = lCp->crnt;
@@ -308,7 +265,7 @@ RgSchRrCList *node;                /* node to be inserted */
 
    lCp->count++;
 
-   RETVOID;
+   return;
 }
 
 /********************************************************************30**