X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_lib.c;h=20ec8207d255419e8a1559e21a0145bf9dcadca2;hb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;hp=f846c60ba064155bd27a3b5a6d180a692844dc38;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git

diff --git a/src/cm/cm_lib.c b/src/cm/cm_lib.c
index f846c60ba..20ec8207d 100644
--- a/src/cm/cm_lib.c
+++ b/src/cm/cm_lib.c
@@ -197,21 +197,20 @@ EXTERN Size regMemSize;
 *
 */
 #ifdef ANSI
-PUBLIC U8 *cmMemcpy
+U8 *cmMemcpy
 (
 U8           *tgt,
 CONSTANT U8  *src,
 PTR          len
 )
 #else
-PUBLIC U8 *cmMemcpy(tgt, src, len)
+U8 *cmMemcpy(tgt, src, len)
 U8           *tgt;
 CONSTANT U8  *src;
 PTR          len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmMemcpy)
 
 #ifdef MS_MBUF_CORRUPTION /* checking for valid memory address */
 if ((tgt > startPtr128) && (tgt < (startPtr128+regMemSize)))
@@ -234,12 +233,12 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize)))
 }
 #endif 
 #if (MEMCPY_AVAIL) /* memcpy is available */
-   RETVALUE((U8 *) memcpy((Void *)tgt, (CONSTANT Void *)src, (size_t)len));
+   return ( memcpy(tgt, src, len));
 #else
    while (len--)
       *tgt++ = *src++;
 
-   RETVALUE(tgt);
+   return (tgt);
 #endif /* MEMCPY_AVAIL */
 
 } /* end of cmMemcpy */
@@ -263,32 +262,31 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize)))
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmMemcmp
+S16 cmMemcmp
 (
 CONSTANT U8     *s1,
 CONSTANT U8     *s2,
 PTR             len
 )
 #else
-PUBLIC S16 cmMemcmp (s1, s2, len)
+S16 cmMemcmp (s1, s2, len)
 CONSTANT U8     *s1;
 CONSTANT U8     *s2;
 PTR             len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmMemcmp)
 #if MEMCMP_AVAIL /* memcmp is available */
-   RETVALUE((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len));
+   return ((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len));
 #else  /* MEMCMP_AVAIL: memcmp is not available */
    while (len--)
    {
       if (*s1 ^ *s2)
-         RETVALUE((S16) (*s1 - *s2));
+         return ((S16) (*s1 - *s2));
       s1++;
       s2++;
    }
-   RETVALUE(0);
+   return (0);
 #endif /* MEMCMP_AVAIL */
 } /* end of cmMemcmp */
 
@@ -312,21 +310,20 @@ PTR             len;
 *
 */
 #ifdef ANSI
-PUBLIC U8 *cmMemset
+U8 *cmMemset
 (
 U8           *str,
 U8           val,
 PTR          len
 )
 #else
-PUBLIC U8 *cmMemset(str, val, len)
+U8 *cmMemset(str, val, len)
 U8           *str;
 U8           val;
 PTR          len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmMemset)
 #if MS_MBUF_CORRUPTION /* checking for valid memory address */
 if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
 {
@@ -345,14 +342,14 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
    }
    else
    {
-      memset((void *)str,val,(size_t) len);
+      memset(str,val, len);
    }
 #else  /* MEMSET_AVAIL: memset is not available */
    while (len --)
       *str++ = val;
 
 #endif /* MEMSET_AVAIL */
-   RETVALUE(str);
+   return (str);
 } /* end of cmMemset */
 
 
@@ -391,31 +388,30 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmStrcmp
+S16 cmStrcmp
 (
 CONSTANT U8 *s1,
 CONSTANT U8 *s2
 )
 #else
-PUBLIC S16 cmStrcmp (s1, s2)
+S16 cmStrcmp (s1, s2)
 CONSTANT U8 *s1;
 CONSTANT U8 *s2;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmStrcmp)
 #if (STRCMP_AVAIL)
-   RETVALUE(strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2));
+   return (strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2));
 #else   /* STRCMP_AVAIL */
   
    while (*s1 && *s2)
    {
       if (*s1 ^ *s2)
-         RETVALUE(*s1 - *s2);
+         return (*s1 - *s2);
       s1++;
       s2++;
    }
-   RETVALUE(0);
+   return (0);
 #endif      /* strcmp is not available */
 
 } /* end of cmStrcmp */
@@ -456,33 +452,32 @@ CONSTANT U8 *s2;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmStrncmp
+S16 cmStrncmp
 (
 CONSTANT U8  *s1,
 CONSTANT U8  *s2,
 MsgLen       len /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/
 )
 #else
-PUBLIC S16 cmStrncmp (s1, s2, len)
+S16 cmStrncmp (s1, s2, len)
 CONSTANT U8  *s1;
 CONSTANT U8  *s2;
 MsgLen       len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmStrncmp)
 #if (STRNCMP_AVAIL)
-   RETVALUE(strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len));
+   return (strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len));
 #else   /* STRNCMP_AVAIL */
   
    while (*s1 && *s2 && len--)
    {
       if (*s1 ^ *s2)
-         RETVALUE(*s1 - *s2);
+         return (*s1 - *s2);
       s1++;
       s2++;
    }
-   RETVALUE(0);
+   return (0);
 #endif   /* strncmp is not available */
 } /* end of cmStrncmp */
 
@@ -511,28 +506,26 @@ MsgLen       len;
 *
 */
 #ifdef ANSI
-PUBLIC MsgLen cmStrlen
+MsgLen cmStrlen
 (
 CONSTANT U8 *s
 )
 #else
 /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/
-PUBLIC MsgLen cmStrlen (s)
+MsgLen cmStrlen (s)
 CONSTANT U8 *s;
 #endif
 {
 #if (STRLEN_AVAIL)
    /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/
-   TRC2(cmStrlen)
-   RETVALUE((MsgLen)strlen((CONSTANT S8 *)s));
+   return ((MsgLen)strlen((CONSTANT S8 *)s));
 #else   /* STRLEN_AVAIL */
    MsgLen i;
   
    /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/
-   TRC2(cmStrlen)
 
    for (i = 0; *s; i++, s++);
-   RETVALUE(i);
+   return (i);
 #endif   /* strlen is not available */
 } /* end of cmStrlen */