X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_msg.c;h=bad1d7f113818c422706a0371a453e3e731ab90b;hb=3fb14013a5209cb17f3e2a5a3faf496b5e9cdd95;hp=b7bd4ebeef3cd4d92b83346d32aaa0c977d451b8;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git

diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c
index b7bd4ebee..bad1d7f11 100644
--- a/src/mt/ss_msg.c
+++ b/src/mt/ss_msg.c
@@ -104,13 +104,13 @@ extern pthread_mutex_t  memLock;
 #include "mt_plat_t33.x"
 #endif
 /* forward declarations */
-PUBLIC S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf));
-PUBLIC S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf);
+S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf));
+S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf);
 #ifdef SSI_STATIC_MEM_LEAK_DETECTION
-EXTERN PUBLIC U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
-EXTERN PUBLIC void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* 
+EXTERN U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
+EXTERN void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* 
          file, U32 line, U32 size, void* ptr, U32 idx));
-EXTERN PUBLIC void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo*
+EXTERN void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo*
          memAllocInfo,U32 size, char* file, U32 line));
 #endif
 
@@ -120,7 +120,7 @@ PRIVATE S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,U32));
 
 #else
 PRIVATE S16 SPutZbcDBuf ARGS((Region region, Buffer *buf));
-PUBLIC S16 SAttachPtrToBuf ARGS(( Region   region, Pool     pool, Data    *ptr,
+S16 SAttachPtrToBuf ARGS(( Region   region, Pool     pool, Data    *ptr,
          MsgLen   totalLen, Buffer** mBuf));
 #endif
 #endif
@@ -133,25 +133,25 @@ PRIVATE Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,U32));
 #else
 #ifdef INTEL_WLS
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAttachPtrToMBuf1 ARGS(( Region   region, Pool     pool, Data    *ptr, MsgLen   totalLen,
+S16 SAttachPtrToMBuf1 ARGS(( Region   region, Pool     pool, Data    *ptr, MsgLen   totalLen,
                                    MsgLen   ptrLen, Buffer** mBuf, char* file, U32 line));
 #else
-PUBLIC S16 SAttachPtrToMBuf ARGS(( Region   region, Pool     pool, Data    *ptr, MsgLen   totalLen,
+S16 SAttachPtrToMBuf ARGS(( Region   region, Pool     pool, Data    *ptr, MsgLen   totalLen,
                                    MsgLen   ptrLen, Buffer** mBuf));
 #endif
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAttachWlsPtrToMBuf1 ARGS(( Region   region, Pool     pool, Data    *ptr, 
+S16 SAttachWlsPtrToMBuf1 ARGS(( Region   region, Pool     pool, Data    *ptr, 
                                       Data    *readPtr,    MsgLen   totalLen,
                                       MsgLen   ptrLen, Buffer** mBuf, char* file, U32 line));
 
-PUBLIC S16 SAttachWlsPtrToMBuf ARGS(( Region   region, Pool     pool, Data    *ptr, 
+S16 SAttachWlsPtrToMBuf ARGS(( Region   region, Pool     pool, Data    *ptr, 
                                       Data    *readPtr,    MsgLen   totalLen,
                                       MsgLen   ptrLen, Buffer** mBuf));
 #endif
 #ifdef TENB_DPDK_BUF
-PUBLIC S16 SDetachDpdkPtrFrmMBuf ARGS((Buffer   *mBuf, Data     **ptr));
-PUBLIC S16 SDetachDpdkPtrFrmDBuf ARGS((Buffer   *mBuf, Data     **ptr));
-PUBLIC S16 SPutSBufDpdk          ARGS(( Data    *ptr));
+S16 SDetachDpdkPtrFrmMBuf ARGS((Buffer   *mBuf, Data     **ptr));
+S16 SDetachDpdkPtrFrmDBuf ARGS((Buffer   *mBuf, Data     **ptr));
+S16 SPutSBufDpdk          ARGS(( Data    *ptr));
 #endif  /* TENB_DPDK_BUF */
 
 
@@ -251,7 +251,7 @@ extern S32 clusterMode;
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 ssGetDBufOfSizeNew
+S16 ssGetDBufOfSizeNew
 (
 Region region,
 Size size,
@@ -261,14 +261,14 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 ssGetDBufOfSize
+S16 ssGetDBufOfSize
 (
 Region region,
 Size size,
 Buffer **dBuf
 )
 #else
-PUBLIC S16 ssGetDBufOfSize(region, size, dBuf)
+S16 ssGetDBufOfSize(region, size, dBuf)
 Region region;
 Size size;
 Buffer **dBuf;
@@ -279,8 +279,6 @@ Buffer **dBuf;
    Data *data;
    SsDblk *dptr;
 
-   TRC1(ssGetDBufOfSize)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check buffer pointer */
    if (!dBuf)
@@ -351,7 +349,7 @@ Buffer **dBuf;
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
 #ifdef ANSI
-PUBLIC S16 SGetMsgNew
+S16 SGetMsgNew
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
@@ -360,7 +358,7 @@ U32    line,
 U8     *fileName
 )
 #else
-PUBLIC S16 SGetMsgNew(region, pool, mBuf, line, fileName)
+S16 SGetMsgNew(region, pool, mBuf, line, fileName)
 Region region;              /* region id */
 Pool pool;                  /* pool id */
 Buffer **mBuf;              /* pointer to message buffer */
@@ -369,7 +367,7 @@ U8     *fileName;
 #endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SGetMsgNew
+S16 SGetMsgNew
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
@@ -379,14 +377,14 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SGetMsg
+S16 SGetMsg
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
 Buffer **mBuf              /* pointer to message buffer */
 )
 #else
-PUBLIC S16 SGetMsg(region, pool, mBuf)
+S16 SGetMsg(region, pool, mBuf)
 Region region;              /* region id */
 Pool pool;                  /* pool id */
 Buffer **mBuf;              /* pointer to message buffer */
@@ -411,8 +409,6 @@ Buffer **mBuf;              /* pointer to message buffer */
 #endif
 
 
-   TRC1(SGetMsgNew)
-
 #ifdef XEON_SPECIFIC_CHANGES
    region = 0;
    pool   = 0;
@@ -582,21 +578,21 @@ S16 SSetMBufPool(Buffer *mBuf, Pool pool)
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
 #ifdef ANSI
-PUBLIC S16 SPutMsgNew
+S16 SPutMsgNew
 (
 Buffer *mBuf,
 U32    line,
 U8     *fileName
 )
 #else
-PUBLIC S16 SPutMsgNew(mBuf, line, fileName)
+S16 SPutMsgNew(mBuf, line, fileName)
 Buffer *mBuf;
 U32    line;
 U8     *fileName;
 #endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SPutMsgNew
+S16 SPutMsgNew
 (
 Buffer *mBuf,
 char* file,
@@ -604,12 +600,12 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SPutMsg
+S16 SPutMsg
 (
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SPutMsg(mBuf)
+S16 SPutMsg(mBuf)
 Buffer *mBuf;
 #endif
 #endif
@@ -626,8 +622,6 @@ Buffer *mBuf;
 	Ent entId = 0;
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC1(SPutMsgNew)
-
 #ifdef L2_OPTMZ
 //#ifdef RADIO_CLUSTER
       if(clusterMode == RADIO_CLUSTER_MODE)
@@ -758,7 +752,7 @@ Buffer *mBuf;
 */
 /* ss001.301: additions */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SPutStaticBufferNew
+S16 SPutStaticBufferNew
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -770,7 +764,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SPutStaticBuffer
+S16 SPutStaticBuffer
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -779,7 +773,7 @@ Size size,                      /* size */
 U8   memType                    /* memory type used if shareable or not */
 )
 #else
-PUBLIC S16 SPutStaticBuffer(region, pool, ptr, size)
+S16 SPutStaticBuffer(region, pool, ptr, size)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data *ptr;                      /* pointer to buffer */
@@ -790,8 +784,6 @@ U8   memType;                   /* memory type used if shareable or not */
 {
    S16 ret = RFAILED;
 
-   TRC1(SPutStaticBuffer);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* validate region ID */
    if (region >= SS_MAX_REGS)
@@ -913,7 +905,7 @@ U8   memType;                   /* memory type used if shareable or not */
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SGetStaticBufferNew
+S16 SGetStaticBufferNew
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -925,7 +917,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SGetStaticBuffer
+S16 SGetStaticBuffer
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -934,7 +926,7 @@ Size size,                      /* size requested */
 U8   memType                    /* memory type used if shareable or not */
 )
 #else
-PUBLIC S16 SGetStaticBuffer(region, pool, ptr, size)
+S16 SGetStaticBuffer(region, pool, ptr, size)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data **ptr;                     /* pointer to buffer */
@@ -946,8 +938,6 @@ U8   memType;                   /* memory type used if shareable or not */
    S16 ret = RFAILED;
    U32 flags;
 
-   TRC1(SGetStaticBuffer);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* validate region ID */
    if (region >= SS_MAX_REGS)
@@ -1030,7 +1020,7 @@ U8   memType;                   /* memory type used if shareable or not */
 #ifdef INTEL_WLS 
 #ifndef SS_LOCKLESS_MEMORY
 #ifdef ANSI
-PUBLIC S16 SGetStaticBuffer
+S16 SGetStaticBuffer
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1039,7 +1029,7 @@ Size size,                      /* size requested */
 U8   memType                    /* memory type used if shareable or not */
 )
 #else
-PUBLIC S16 SGetStaticBuffer(region, pool, ptr, size)
+S16 SGetStaticBuffer(region, pool, ptr, size)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data **ptr;                     /* pointer to buffer */
@@ -1056,7 +1046,7 @@ U8   memType;                   /* memory type used if shareable or not */
 
 
 #ifdef ANSI
-PUBLIC S16 SPutStaticBuffer
+S16 SPutStaticBuffer
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1065,7 +1055,7 @@ Size size,                      /* size */
 U8   memType                    /* memory type used if shareable or not */
 )
 #else
-PUBLIC S16 SPutStaticBuffer(region, pool, ptr, size)
+S16 SPutStaticBuffer(region, pool, ptr, size)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data *ptr;                      /* pointer to buffer */
@@ -1083,7 +1073,7 @@ U8   memType;                   /* memory type used if shareable or not */
 }
 #endif
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SGetSBufWls1
+S16 SGetSBufWls1
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1093,7 +1083,7 @@ char* file,
 U32 line
 )
 #else
-PUBLIC S16 SGetSBufWls
+S16 SGetSBufWls
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1125,7 +1115,7 @@ Size size                       /* size requested */
 }
 
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SPutSBufWls1
+S16 SPutSBufWls1
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1135,7 +1125,7 @@ char* file,
 U32 line
 )
 #else
-PUBLIC S16 SPutSBufWls
+S16 SPutSBufWls
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1184,7 +1174,7 @@ Size size                      /* size */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef ANSI
-PUBLIC S16 SGetSBufNew
+S16 SGetSBufNew
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1194,7 +1184,7 @@ U32    line,
 U8     *fileName
 )
 #else
-PUBLIC S16 SGetSBufNew(region, pool, ptr, size, line, fileName)
+S16 SGetSBufNew(region, pool, ptr, size, line, fileName)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data **ptr;                     /* pointer to buffer */
@@ -1205,7 +1195,7 @@ U8     *fileName;
 #else /* SS_HISTOGRAM_SUPPORT */
 #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG))
 #ifdef ANSI
-PUBLIC S16 SGetSBuf1
+S16 SGetSBuf1
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1215,7 +1205,7 @@ char* file,
 U32 line
 )
 #else
-PUBLIC S16 SGetSBuf1(region, pool, ptr, size, file, line)
+S16 SGetSBuf1(region, pool, ptr, size, file, line)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data **ptr;                     /* pointer to buffer */
@@ -1225,7 +1215,7 @@ U32 line;
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 SGetSBuf
+S16 SGetSBuf
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1233,7 +1223,7 @@ Data **ptr,                     /* pointer to buffer */
 Size size                       /* size requested */
 )
 #else
-PUBLIC S16 SGetSBuf(region, pool, ptr, size)
+S16 SGetSBuf(region, pool, ptr, size)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data **ptr;                     /* pointer to buffer */
@@ -1253,7 +1243,6 @@ Size size;                      /* size requested */
 	Bool hstReg = FALSE;
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC1(SGetSBufNew);
 
    region = SS_GET_THREAD_MEM_REGION();
 #ifdef INTEL_WLS
@@ -1461,7 +1450,7 @@ Size size;                      /* size requested */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef ANSI
-PUBLIC S16 SPutSBufNew
+S16 SPutSBufNew
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1471,7 +1460,7 @@ U32    line,
 U8     *fileName
 )
 #else
-PUBLIC S16 SPutSBufNew(region, pool, ptr, size, line, fileName)
+S16 SPutSBufNew(region, pool, ptr, size, line, fileName)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data *ptr;                      /* pointer to buffer */
@@ -1482,7 +1471,7 @@ U8     *fileName;
 #else  /* SS_HISTOGRAM_SUPPORT  */
 #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG))
 #ifdef ANSI
-PUBLIC S16 SPutSBuf1
+S16 SPutSBuf1
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1492,7 +1481,7 @@ char* file,
 U32 line
 )
 #else
-PUBLIC S16 SPutSBuf1(region, pool, ptr, size, file, line)
+S16 SPutSBuf1(region, pool, ptr, size, file, line)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data *ptr;                      /* pointer to buffer */
@@ -1502,7 +1491,7 @@ U32 line;
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 SPutSBuf
+S16 SPutSBuf
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
@@ -1510,7 +1499,7 @@ Data *ptr,                      /* pointer to buffer */
 Size size                      /* size */
 )
 #else
-PUBLIC S16 SPutSBuf(region, pool, ptr, size)
+S16 SPutSBuf(region, pool, ptr, size)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Data *ptr;                      /* pointer to buffer */
@@ -1526,9 +1515,6 @@ Size size;                      /* size */
 	Bool hstReg = FALSE;
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC1(SPutSBufNew);
-
-
    region = SS_GET_THREAD_MEM_REGION();
 #if (!defined(SS_LOCKLESS_MEMORY) && defined(INTEL_WLS))
    region = 1;
@@ -1693,12 +1679,12 @@ Size size;                      /* size */
 */
 
 #ifdef ANSI
-PUBLIC S16 SInitMsg
+S16 SInitMsg
 (
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SInitMsg(mBuf)
+S16 SInitMsg(mBuf)
 Buffer *mBuf;
 #endif
 {
@@ -1706,8 +1692,6 @@ Buffer *mBuf;
    Buffer *tmp;
    U8     tmpRegId;
 
-   TRC1(SInitMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
    if (mBuf == NULLP)
@@ -1784,14 +1768,14 @@ Buffer *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SAddPreMsgMultInOrder
+S16 SAddPreMsgMultInOrder
 (
  Data *src,
  MsgLen cnt,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
+S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
     Data *src;
     MsgLen cnt;
     Buffer *mBuf;
@@ -1807,7 +1791,6 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
    MsgLen offset;
    Data *rptr;
    Data *revSrc;
-   TRC1(SAddPreMsgMultInOrder)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
       /* check message buffer */
@@ -1973,13 +1956,13 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
 
  
 #ifdef ANSI
-PUBLIC S16 SAddPreMsg
+S16 SAddPreMsg
 (
 Data data,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SAddPreMsg (data, mBuf)
+S16 SAddPreMsg (data, mBuf)
 Data data;
 Buffer *mBuf;
 #endif
@@ -1988,8 +1971,6 @@ Buffer *mBuf;
    Buffer *tmp;
    Buffer *newb;
 
-   TRC1(SAddPreMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
    if (!mBuf)
@@ -2077,13 +2058,13 @@ Buffer *mBuf;
 
  
 #ifdef ANSI
-PUBLIC S16 SAddPstMsg
+S16 SAddPstMsg
 (
 Data data,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SAddPstMsg (data, mBuf)
+S16 SAddPstMsg (data, mBuf)
 Data data;
 Buffer *mBuf;
 #endif
@@ -2091,8 +2072,6 @@ Buffer *mBuf;
    SsMsgInfo *minfo;
    Buffer *tmp;
    Buffer *newb;
- 
-   TRC1(SAddPstMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
@@ -2169,7 +2148,7 @@ Buffer *mBuf;
 */
  
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAddPreMsgMult1
+S16 SAddPreMsgMult1
 (
 Data *src,
 MsgLen cnt,
@@ -2180,14 +2159,14 @@ U32    line
 
 #else
 #ifdef ANSI
-PUBLIC S16 SAddPreMsgMult
+S16 SAddPreMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SAddPreMsgMult(src, cnt, mBuf)
+S16 SAddPreMsgMult(src, cnt, mBuf)
 Data *src;
 MsgLen cnt;
 Buffer *mBuf;
@@ -2204,8 +2183,6 @@ Buffer *mBuf;
    MsgLen offset;
    Data *rptr;
 
-   TRC1(SAddPreMsgMult)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
    if (mBuf == NULLP)
@@ -2348,7 +2325,7 @@ Buffer *mBuf;
 */
 
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAddPstMsgMult1
+S16 SAddPstMsgMult1
 (
 Data *src,
 MsgLen cnt,
@@ -2358,14 +2335,14 @@ U32    line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SAddPstMsgMult
+S16 SAddPstMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SAddPstMsgMult(src, cnt, mBuf)
+S16 SAddPstMsgMult(src, cnt, mBuf)
 Data *src;
 MsgLen cnt;
 Buffer *mBuf;
@@ -2382,8 +2359,6 @@ Buffer *mBuf;
    MsgLen numBytes;
    Data *wptr;
 
-   TRC1(SAddPstMsgMult)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
    if (mBuf == NULLP)
@@ -2535,13 +2510,13 @@ Buffer *mBuf;
 
  
 #ifdef ANSI
-PUBLIC S16 SRemPreMsg
+S16 SRemPreMsg
 (
 Data *dataPtr,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SRemPreMsg(dataPtr, mBuf)
+S16 SRemPreMsg(dataPtr, mBuf)
 Data *dataPtr;
 Buffer *mBuf;
 #endif
@@ -2553,8 +2528,6 @@ Buffer *mBuf;
    U32 line = __LINE__;
 #endif
 
-   TRC1(SRemPreMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check data pointer */
    if (!dataPtr)
@@ -2622,13 +2595,13 @@ Buffer *mBuf;
 
 
 #ifdef ANSI
-PUBLIC S16 SRemPstMsg
+S16 SRemPstMsg
 (
 Data *dataPtr,              /* pointer to data */
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SRemPstMsg(dataPtr, mBuf)
+S16 SRemPstMsg(dataPtr, mBuf)
 Data *dataPtr;              /* pointer to data */
 Buffer *mBuf;               /* message buffer */
 #endif
@@ -2641,8 +2614,6 @@ Buffer *mBuf;               /* message buffer */
    U32 line = __LINE__;
 #endif
 
-   TRC1(SRemPstMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check data pointer */
    if (dataPtr == NULLP)
@@ -2724,14 +2695,14 @@ Buffer *mBuf;               /* message buffer */
 */
 
 #ifdef ANSI
-PUBLIC S16 SRemPreMsgMult
+S16 SRemPreMsgMult
 (
 Data *dst,                  /* destination */
 MsgLen cnt,                 /* count */
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SRemPreMsgMult(dst, cnt, mBuf)
+S16 SRemPreMsgMult(dst, cnt, mBuf)
 Data *dst;                  /* destination */
 MsgLen cnt;                 /* count */
 Buffer *mBuf;               /* message buffer */
@@ -2745,7 +2716,6 @@ Buffer *mBuf;               /* message buffer */
    U32 line = __LINE__;
 #endif
 
-   TRC1(SRemPreMsgMult)
 
    /* ss023.103 - Modification of SRemPreMsgMult for bug fix */
 
@@ -2847,14 +2817,14 @@ Buffer *mBuf;               /* message buffer */
 */
 
 #ifdef ANSI
-PUBLIC S16 SRemPstMsgMult
+S16 SRemPstMsgMult
 (
 Data *dst,                  /* destination */
 MsgLen cnt,                 /* count */
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SRemPstMsgMult(dst, cnt, mBuf)
+S16 SRemPstMsgMult(dst, cnt, mBuf)
 Data *dst;                  /* destination */
 MsgLen cnt;                 /* count */
 Buffer *mBuf;               /* message buffer */
@@ -2871,7 +2841,6 @@ Buffer *mBuf;               /* message buffer */
    U32 line = __LINE__;
 #endif
 
-   TRC1(SRemPstMsgMult)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check count */
@@ -2982,14 +2951,14 @@ Buffer *mBuf;               /* message buffer */
 
 
 #ifdef ANSI
-PUBLIC S16 SExamMsg
+S16 SExamMsg
 (
 Data *dataPtr,              /* pointer to data */
 Buffer *mBuf,               /* message buffer */
 MsgLen idx
 )
 #else
-PUBLIC S16 SExamMsg(dataPtr, mBuf, idx)
+S16 SExamMsg(dataPtr, mBuf, idx)
 Data *dataPtr;              /* pointer to data */
 Buffer *mBuf;               /* message buffer */
 MsgLen idx;                 /* index */
@@ -2998,8 +2967,6 @@ MsgLen idx;                 /* index */
    SsMsgInfo *minfo;
    Buffer *tmp;
 
-   TRC1(SExamMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check data pointer */
    if (!dataPtr)
@@ -3077,7 +3044,7 @@ MsgLen idx;                 /* index */
 
 
 #ifdef ANSI
-PUBLIC S16 SGetDataFrmMsg 
+S16 SGetDataFrmMsg 
 (
 Buffer *mBuf,               /* message buffer */
 Data *dataPtr,              /* pointer to data */
@@ -3085,7 +3052,7 @@ MsgLen idx,
 MsgLen dataLen
 )
 #else
-PUBLIC S16 SGetDataFrmMsg(mBuf, dataPtr, idx, dataLen)
+S16 SGetDataFrmMsg(mBuf, dataPtr, idx, dataLen)
 Buffer *mBuf;               /* message buffer */
 Data *dataPtr;              /* pointer to data */
 MsgLen idx;                 /* index */
@@ -3097,8 +3064,6 @@ MsgLen dataLen;
 	MsgLen offSetLen;
 	Data   *tmpDataPtr = dataPtr;
 
-   TRC1(SGetDataFrmMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check data pointer */
    if (!dataPtr)
@@ -3185,21 +3150,19 @@ MsgLen dataLen;
 
 
 #ifdef ANSI
-PUBLIC S16 SFndLenMsg
+S16 SFndLenMsg
 (
 REG1 Buffer *mBuf,          /* message buffer */
 MsgLen *lngPtr
 )
 #else
-PUBLIC S16 SFndLenMsg(mBuf, lngPtr)
+S16 SFndLenMsg(mBuf, lngPtr)
 REG1 Buffer *mBuf;          /* message buffer */
 MsgLen *lngPtr;             /* pointer to length */
 #endif
 {
    SsMsgInfo *minfo;
 
-   TRC1(SFndLenMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
    if (mBuf == NULLP)
@@ -3270,7 +3233,7 @@ MsgLen *lngPtr;             /* pointer to length */
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SSegMsgNew
+S16 SSegMsgNew
 (
 Buffer *mBuf1,              /* message 1 */
 MsgLen idx,                 /* index */
@@ -3280,14 +3243,14 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SSegMsg
+S16 SSegMsg
 (
 Buffer *mBuf1,              /* message 1 */
 MsgLen idx,                 /* index */
 Buffer **mBuf2
 )
 #else
-PUBLIC S16 SSegMsg(mBuf1, idx, mBuf2)
+S16 SSegMsg(mBuf1, idx, mBuf2)
 Buffer *mBuf1;              /* message 1 */
 MsgLen idx;                 /* index */
 Buffer **mBuf2;             /* message 2 */
@@ -3300,7 +3263,6 @@ Buffer **mBuf2;             /* message 2 */
    Buffer *prev;
    Buffer *next;
 
-   TRC1(SSegMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer 1 */
@@ -3478,7 +3440,7 @@ Buffer **mBuf2;             /* message 2 */
 */
 
 #ifdef ANSI
-PUBLIC S16 SCpyFixMsg
+S16 SCpyFixMsg
 (
 Data *srcBuf,               /* source buffer */
 Buffer *dstMbuf,            /* destination message buffer */
@@ -3487,7 +3449,7 @@ MsgLen cnt,                 /* count */
 MsgLen *cCnt
 )
 #else
-PUBLIC S16 SCpyFixMsg(srcBuf, dstMbuf, dstIdx, cnt, cCnt)
+S16 SCpyFixMsg(srcBuf, dstMbuf, dstIdx, cnt, cCnt)
 Data *srcBuf;               /* source buffer */
 Buffer *dstMbuf;            /* destination message buffer */
 MsgLen dstIdx;              /* destination index */
@@ -3499,8 +3461,6 @@ MsgLen *cCnt;               /* copied count */
    SsMsgInfo *minfo;
    Buffer *right;
 
-   TRC1(SCpyFixMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check source message buffer */
    if (srcBuf == NULLP)
@@ -3633,7 +3593,7 @@ MsgLen *cCnt;               /* copied count */
 */
 
 #ifdef ANSI
-PUBLIC S16 SCpyMsgFix
+S16 SCpyMsgFix
 (
 Buffer *srcMbuf,            /* source message buffer */
 MsgLen srcIdx,              /* source index */
@@ -3642,7 +3602,7 @@ Data *dstBuf,               /* destination buffer */
 MsgLen *cCnt
 )
 #else
-PUBLIC S16 SCpyMsgFix(srcMbuf, srcIdx, cnt, dstBuf, cCnt)
+S16 SCpyMsgFix(srcMbuf, srcIdx, cnt, dstBuf, cCnt)
 Buffer *srcMbuf;            /* source message buffer */
 MsgLen srcIdx;              /* source index */
 MsgLen cnt;                 /* count */
@@ -3655,8 +3615,6 @@ MsgLen *cCnt;               /* copied count */
    SsMsgInfo *minfo;
    MsgLen numBytes;
 
-   TRC1(SCpyMsgFix)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check source message buffer */
    if (srcMbuf == NULLP)
@@ -3762,7 +3720,7 @@ MsgLen *cCnt;               /* copied count */
 */
 
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SCpyMsgMsgNew
+S16 SCpyMsgMsgNew
 (
 Buffer *srcBuf,
 Region dstRegion,
@@ -3773,7 +3731,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SCpyMsgMsg
+S16 SCpyMsgMsg
 (
 Buffer *srcBuf,
 Region dstRegion,
@@ -3781,7 +3739,7 @@ Pool dstPool,
 Buffer **dstBuf
 )
 #else
-PUBLIC S16 SCpyMsgMsg(srcBuf, dstRegion, dstPool, dstBuf)
+S16 SCpyMsgMsg(srcBuf, dstRegion, dstPool, dstBuf)
 Buffer *srcBuf;
 Region dstRegion;
 Pool dstPool;
@@ -3803,8 +3761,6 @@ Buffer **dstBuf;
 #endif
 #endif
  
-   TRC1(SCpyMsgMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!srcBuf)
    {
@@ -3965,7 +3921,7 @@ Buffer **dstBuf;
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAddMsgRefNew
+S16 SAddMsgRefNew
 (
 Buffer *srcBuf,
 Region dstRegion,
@@ -3976,7 +3932,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SAddMsgRef
+S16 SAddMsgRef
 (
 Buffer *srcBuf,
 Region dstRegion,
@@ -3984,7 +3940,7 @@ Pool dstPool,
 Buffer **dstBuf
 )
 #else
-PUBLIC S16 SAddMsgRef(srcBuf, dstRegion, dstPool, dstBuf)
+S16 SAddMsgRef(srcBuf, dstRegion, dstPool, dstBuf)
 Buffer *srcBuf;
 Region dstRegion;
 Pool dstPool;
@@ -4002,7 +3958,6 @@ Buffer **dstBuf;
    Data *cptr;
    MsgLen numBytes;
 
-   TRC1(SAddMsgRef)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!srcBuf)
@@ -4155,8 +4110,6 @@ Buffer *mp;                 /* message block */
    S16 r;                       /* return value */
    Size m;                      /* temporary */
 
-   TRC1(DupMsg);
-
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP)
@@ -4262,7 +4215,7 @@ Buffer *mp;                 /* message block */
 */
 
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SGetDBufNew
+S16 SGetDBufNew
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
@@ -4272,14 +4225,14 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SGetDBuf
+S16 SGetDBuf
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
 Buffer **bufPtr
 )
 #else
-PUBLIC S16 SGetDBuf(region, pool, bufPtr)
+S16 SGetDBuf(region, pool, bufPtr)
 Region region;              /* region id */
 Pool pool;                  /* pool id */
 Buffer **bufPtr;            /* pointer to buffer */
@@ -4306,8 +4259,6 @@ Buffer **bufPtr;            /* pointer to buffer */
 #endif
 #endif
    
-   TRC1(SGetDBuf)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check buffer pointer */
    if (!bufPtr)
@@ -4447,7 +4398,7 @@ Buffer **bufPtr;            /* pointer to buffer */
 */
 
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SPutDBufNew
+S16 SPutDBufNew
 (
 Region region,
 Pool pool,
@@ -4457,14 +4408,14 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SPutDBuf
+S16 SPutDBuf
 (
 Region region,
 Pool pool,
 Buffer *buf
 )
 #else
-PUBLIC S16 SPutDBuf(region, pool, buf)
+S16 SPutDBuf(region, pool, buf)
 Region region;
 Pool pool;
 Buffer *buf;
@@ -4478,7 +4429,6 @@ Buffer *buf;
    Data  *dpdkBuf;
 #endif   
  
-   TRC2(SPutDBuf);
  
    /* ss021.103 - Addition of ret initialization */
    ret = ROK;
@@ -4643,14 +4593,14 @@ Buffer *buf;
 
 
 #ifdef ANSI
-PUBLIC S16 SCatMsg
+S16 SCatMsg
 (
 Buffer *mBuf1,              /* message 1 */
 Buffer *mBuf2,              /* message 2 */
 Order order
 )
 #else
-PUBLIC S16 SCatMsg(mBuf1, mBuf2, order)
+S16 SCatMsg(mBuf1, mBuf2, order)
 Buffer *mBuf1;              /* message 1 */
 Buffer *mBuf2;              /* message 2 */
 Order order;                /* order */
@@ -4661,8 +4611,6 @@ Order order;                /* order */
    Buffer *tmp;
    Buffer *newb;
 
-   TRC1(SCatMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer 1 */
    if (mBuf1 == NULLP)
@@ -4804,14 +4752,14 @@ Order order;                /* order */
 
 
 #ifdef ANSI
-PUBLIC S16 SRepMsg
+S16 SRepMsg
 (
 Data data,                  /* data */
 Buffer *mBuf,               /* message buffer */
 MsgLen idx
 )
 #else
-PUBLIC S16 SRepMsg(data, mBuf, idx)
+S16 SRepMsg(data, mBuf, idx)
 Data data;                  /* data */
 Buffer *mBuf;               /* message buffer */
 MsgLen idx;                 /* index */
@@ -4823,7 +4771,6 @@ MsgLen idx;                 /* index */
    Buffer *prev;
    MsgLen numBytes;
 
-   TRC1(SRepMsg)
 
 #ifdef T2K_MEM_LEAK_DBG
    char* file = __FILE__;
@@ -4906,14 +4853,14 @@ MsgLen idx;                 /* index */
 
 
 #ifdef ANSI
-PUBLIC S16 SUpdMsg
+S16 SUpdMsg
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer *dBuf,                   /* data buffer */
 MsgLen dLen
 )
 #else
-PUBLIC S16 SUpdMsg(mBuf, dBuf, dLen)
+S16 SUpdMsg(mBuf, dBuf, dLen)
 Buffer *mBuf;                   /* message buffer */
 Buffer *dBuf;                   /* data buffer */
 MsgLen dLen;                    /* data length */
@@ -4921,8 +4868,6 @@ MsgLen dLen;                    /* data length */
 {
    SsMsgInfo *minfo;
 
-   TRC1(SUpdMsg)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!mBuf)
    {
@@ -4999,21 +4944,19 @@ MsgLen dLen;                    /* data length */
 
  
 #ifdef ANSI
-PUBLIC S16 SAddDBufPst
+S16 SAddDBufPst
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer *dBuf
 )
 #else
-PUBLIC S16 SAddDBufPst(mBuf, dBuf)
+S16 SAddDBufPst(mBuf, dBuf)
 Buffer *mBuf;                   /* message buffer */
 Buffer *dBuf;                   /* data buffer */
 #endif
 {
    SsMsgInfo *minfo;
 
-   TRC1(SAddDBufPst)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check buffer queue */
    if (!mBuf || !dBuf)
@@ -5072,13 +5015,13 @@ Buffer *dBuf;                   /* data buffer */
 
  
 #ifdef ANSI
-PUBLIC S16 SAddDBufPre
+S16 SAddDBufPre
 (
 Buffer *mBuf,                    /* message buffer */
 Buffer *dBuf
 )
 #else
-PUBLIC S16 SAddDBufPre(mBuf, dBuf)
+S16 SAddDBufPre(mBuf, dBuf)
 Buffer *mBuf;                    /* message buffer */
 Buffer *dBuf;                    /* data buffer */
 #endif
@@ -5086,8 +5029,6 @@ Buffer *dBuf;                    /* data buffer */
    SsMsgInfo *minfo;
    Buffer *tmp;
 
-   TRC1(SAddDBufPre)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check buffer queue */
    if (!mBuf || !dBuf)
@@ -5148,21 +5089,19 @@ Buffer *dBuf;                    /* data buffer */
 
  
 #ifdef ANSI
-PUBLIC S16 SRemDBufPre
+S16 SRemDBufPre
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBufPtr
 )
 #else
-PUBLIC S16 SRemDBufPre(mBuf, dBufPtr)
+S16 SRemDBufPre(mBuf, dBufPtr)
 Buffer *mBuf;                   /* message buffer */
 Buffer **dBufPtr;               /* pointer to data buffer */
 #endif
 {
    SsMsgInfo *minfo;
 
-   TRC1(SRemDBufPre)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check buffer pointer */
    if (dBufPtr == NULLP)
@@ -5225,13 +5164,13 @@ Buffer **dBufPtr;               /* pointer to data buffer */
 
  
 #ifdef ANSI
-PUBLIC S16 SRemDBufPst
+S16 SRemDBufPst
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBufPtr
 )
 #else
-PUBLIC S16 SRemDBufPst(mBuf, dBufPtr)
+S16 SRemDBufPst(mBuf, dBufPtr)
 Buffer *mBuf;                   /* message buffer */
 Buffer **dBufPtr;               /* pointer to data buffer */
 #endif
@@ -5239,8 +5178,6 @@ Buffer **dBufPtr;               /* pointer to data buffer */
    SsMsgInfo *minfo;
    Buffer *tmp;
 
-   TRC1(SRemDBufPst)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check buffer pointer */
    if (!dBufPtr)
@@ -5299,19 +5236,17 @@ Buffer **dBufPtr;               /* pointer to data buffer */
 
  
 #ifdef ANSI
-PUBLIC S16 SInitNxtDBuf
+S16 SInitNxtDBuf
 (
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SInitNxtDBuf(mBuf)
+S16 SInitNxtDBuf(mBuf)
 Buffer *mBuf;                   /* message buffer */
 #endif
 {
    SsMsgInfo *minfo;
 
-   TRC1(SInitNxtDBuf)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!mBuf)
    {
@@ -5350,21 +5285,19 @@ Buffer *mBuf;                   /* message buffer */
 
  
 #ifdef ANSI
-PUBLIC S16 SGetNxtDBuf
+S16 SGetNxtDBuf
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBuf
 )
 #else
-PUBLIC S16 SGetNxtDBuf(mBuf, dBuf)
+S16 SGetNxtDBuf(mBuf, dBuf)
 Buffer *mBuf;                   /* message buffer */
 Buffer **dBuf;                  /* data buffer return */
 #endif
 {
    SsMsgInfo *minfo;
 
-   TRC1(SGetNxtDBuf)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!mBuf)
    {
@@ -5411,19 +5344,17 @@ Buffer **dBuf;                  /* data buffer return */
 */
 
 #ifdef ANSI
-PUBLIC S16 SChkNxtDBuf
+S16 SChkNxtDBuf
 (
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SChkNxtDBuf(mBuf)
+S16 SChkNxtDBuf(mBuf)
 Buffer *mBuf;                   /* message buffer */
 #endif
 {
    SsMsgInfo *minfo;
 
-   TRC1(SChkNxtDBuf)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!mBuf)
    {
@@ -5466,7 +5397,7 @@ Buffer *mBuf;                   /* message buffer */
 
  
 #ifdef ANSI
-PUBLIC S16 SGetDataRx
+S16 SGetDataRx
 (
 Buffer *dBuf,                   /* data buffer */
 MsgLen pad,                     /* pad */
@@ -5474,14 +5405,13 @@ Data **retDatPtr,               /* return data pointer */
 MsgLen *retDatLen
 )
 #else
-PUBLIC S16 SGetDataRx(dBuf, pad, retDatPtr, retDatLen)
+S16 SGetDataRx(dBuf, pad, retDatPtr, retDatLen)
 Buffer *dBuf;                   /* data buffer */
 MsgLen pad;                     /* pad */
 Data **retDatPtr;               /* return data pointer */
 MsgLen *retDatLen;              /* return data length */
 #endif
 {
-   TRC1(SGetDataRx)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!dBuf)
@@ -5550,20 +5480,19 @@ MsgLen *retDatLen;              /* return data length */
 
  
 #ifdef ANSI
-PUBLIC S16 SGetDataTx
+S16 SGetDataTx
 (
 Buffer *dBuf,                   /* data buffer */
 Data **retDatPtr,               /* return data pointer */
 MsgLen *retDatLen               /* return data length */
 )
 #else
-PUBLIC S16 SGetDataTx(dBuf, retDatPtr, retDatLen)
+S16 SGetDataTx(dBuf, retDatPtr, retDatLen)
 Buffer *dBuf;                   /* data buffer */
 Data **retDatPtr;               /* return data pointer */
 MsgLen *retDatLen;              /* return data length */
 #endif
 {
-   TRC1(SGetDataTx)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* ss021.103 - Modification to check parameters */
@@ -5624,14 +5553,14 @@ MsgLen *retDatLen;              /* return data length */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetBufRegionPool
+S16 SGetBufRegionPool
 (
 Buffer *mBuf,                   /* message buffer */
 Region *region,                 /* region */
 Pool   *pool                    /* pool */
 )
 #else
-PUBLIC S16 SGetBufRegionPool(mBuf, region, pool)
+S16 SGetBufRegionPool(mBuf, region, pool)
 Buffer *mBuf;                   /* message buffer */
 Region *region;                 /* region */
 Pool   *pool;                   /* pool */
@@ -5639,7 +5568,6 @@ Pool   *pool;                   /* pool */
 {
    SsMsgInfo *mInfo;            /* message info pointer */
 
-   TRC1(SGetBufRegionPool)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
 
@@ -5702,12 +5630,12 @@ Pool   *pool;                   /* pool */
 
  
 #ifdef ANSI
-PUBLIC S16 SCompressMsg
+S16 SCompressMsg
 (
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SCompressMsg(mBuf)
+S16 SCompressMsg(mBuf)
 Buffer *mBuf;                    /* message buffer */
 #endif
 {
@@ -5722,7 +5650,6 @@ Buffer *mBuf;                    /* message buffer */
    char* file = __FILE__;
    U32 line = __LINE__;
 #endif
-   TRC1(SCompressMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!mBuf)
@@ -5800,14 +5727,14 @@ Buffer *mBuf;                    /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 SPrntMsg
+S16 SPrntMsg
 (
 Buffer *mBuf,               /* message buffer */
 S16 src,                    /* source id */
 S16 dst                     /* destination id */
 )
 #else
-PUBLIC S16 SPrntMsg(mBuf, src, dst)
+S16 SPrntMsg(mBuf, src, dst)
 Buffer *mBuf;               /* message buffer */
 S16 src;                    /* source id */
 S16 dst;                    /* destination id */
@@ -5831,7 +5758,6 @@ S16 dst;                    /* destination id */
    Data reg;
 
 
-   TRC1(SPrntMsg)
 
    if (mBuf == NULLP)
    {
@@ -5958,13 +5884,13 @@ S16 dst;                    /* destination id */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetPstMsgMult
+S16 SGetPstMsgMult
 (
 MsgLen cnt,                 /* count */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 SGetPstMsgMult(cnt, mBuf)
+S16 SGetPstMsgMult(cnt, mBuf)
 MsgLen cnt;                 /* count */
 Buffer *mBuf;               /* message buffer */
 #endif
@@ -5975,7 +5901,6 @@ Buffer *mBuf;               /* message buffer */
    MsgLen numBytes;
    MsgLen avail;
 
-   TRC1(SGetPstMsgMult)
 
 #if ( ERRCLASS & ERRCLS_INT_PAR )
    /* check message buffer */
@@ -6063,19 +5988,18 @@ Buffer *mBuf;               /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SChkMsg
+S16 SChkMsg
 (
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SChkMsg(mBuf)
+S16 SChkMsg(mBuf)
 Buffer *mBuf;
 #endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
 
-   TRC1(SChkMsg)
  
 #if ( ERRCLASS & ERRCLS_INT_PAR )
    /* check message buffer */
@@ -6118,20 +6042,18 @@ Buffer *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SAlignDBufEven
+S16 SAlignDBufEven
 (
 Buffer *dBuf                      /* data buffer */
 )
 #else
-PUBLIC S16 SAlignDBufEven(dBuf)
+S16 SAlignDBufEven(dBuf)
 Buffer *dBuf;                   /* data buffer  */
 #endif
 {
    MsgLen len;
    Data *src;
 
-   TRC1(SAlignDBufEven)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!dBuf)
    {
@@ -6193,13 +6115,13 @@ Buffer *dBuf;                   /* data buffer  */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SAlignDBuf
+S16 SAlignDBuf
 (
 Buffer *dBuf,                      /* data buffer */
 U32    align                       /* alignemnt required */
 )
 #else
-PUBLIC S16 SAlignDBuf(dBuf, align)
+S16 SAlignDBuf(dBuf, align)
 Buffer *dBuf;                      /* data buffer  */
 U32    align;                      /* alignemnt required */
 #endif
@@ -6209,8 +6131,6 @@ U32    align;                      /* alignemnt required */
    U32    upShift;                 /* no. of bytes to be shifted up */
    U32    downShift;               /* no. of bytes to be shifted down */
 
-   TRC1(SAlignDBuf)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!dBuf)
    {
@@ -6286,21 +6206,19 @@ U32    align;                      /* alignemnt required */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetSMem
+S16 SGetSMem
 (
 Region region,                  /* region ID */
 Size size,                      /* size */
 Pool *pool                      /* pointer to pool ID */
 )
 #else
-PUBLIC S16 SGetSMem(region, size, pool)
+S16 SGetSMem(region, size, pool)
 Region region;                  /* region ID */
 Size size;                      /* size */
 Pool *pool;                     /* pointer to pool ID */
 #endif
 {
-   TRC1(SGetSMem);
-
 
    UNUSED(size);
 
@@ -6347,13 +6265,13 @@ Pool *pool;                     /* pointer to pool ID */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SPutSMem
+S16 SPutSMem
 (
 Region region,                  /* region ID */
 Pool pool                       /* pool ID */
 )
 #else
-PUBLIC S16 SPutSMem(region, pool)
+S16 SPutSMem(region, pool)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 #endif
@@ -6363,8 +6281,6 @@ Pool pool;                      /* pool ID */
    S16   ret;
 #endif
 
-   TRC1(SPutSMem);
-
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* validate region ID */
@@ -6443,14 +6359,14 @@ Pool pool;                      /* pool ID */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SChkRes
+S16 SChkRes
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
 Status *status                  /* pointer to status */
 )
 #else
-PUBLIC S16 SChkRes(region, pool, status)
+S16 SChkRes(region, pool, status)
 Region region;                  /* region ID */
 Pool pool;                      /* pool ID */
 Status *status;                 /* pointer to status */
@@ -6460,8 +6376,6 @@ Status *status;                 /* pointer to status */
    SMemCtl mctl;
 
 
-   TRC1(SChkRes);
-
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* validate region ID */
@@ -6571,13 +6485,13 @@ Status *status;                 /* pointer to status */
 
 
 #ifdef ANSI
-PUBLIC S16 SSwapMsg
+S16 SSwapMsg
 (
 Buffer *mBuf1,              /* message 1 */
 Buffer *mBuf2               /* message 2 */
 )
 #else
-PUBLIC S16 SSwapMsg(mBuf1, mBuf2)
+S16 SSwapMsg(mBuf1, mBuf2)
 Buffer *mBuf1;              /* message 1 */
 Buffer *mBuf2;              /* message 2 */
 #endif
@@ -6591,7 +6505,6 @@ Buffer *mBuf2;              /* message 2 */
    Buffer *tmp;
    U8 tmp2;
    
-   TRC1(SSwapMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer 1 */
@@ -6683,12 +6596,12 @@ Buffer *mBuf2;              /* message 2 */
  *
  */
 #ifdef ANSI
-PUBLIC S16 SConvPtrPhy
+S16 SConvPtrPhy
 (
  Buffer  **mBuf
 )
 #else
-PUBLIC S16 SConvPtrPhy (mBuf)
+S16 SConvPtrPhy (mBuf)
   Buffer **mBuf;
 #endif
 {
@@ -6699,8 +6612,6 @@ PUBLIC S16 SConvPtrPhy (mBuf)
   SsDblk      *dblkPtr;
   SsFrtn      *frtnPtr;
 
-  TRC1(SConvPtrPhy);
-
 
   /* check mBuf for NULLP */
   if ( (mBuf == NULLP) || (*mBuf == NULLP ) )
@@ -6841,12 +6752,12 @@ PUBLIC S16 SConvPtrPhy (mBuf)
  *
  */
 #ifdef ANSI
-PUBLIC S16 SConvPhyPtr
+S16 SConvPhyPtr
 (
  Buffer  **workPtr
  )
 #else
-PUBLIC S16 SConvPhyPtr (workPtr)
+S16 SConvPhyPtr (workPtr)
   Buffer  **workPtr;
 #endif
 {
@@ -6857,8 +6768,6 @@ PUBLIC S16 SConvPhyPtr (workPtr)
   SsDblk      *dblkPtr;
   SsFrtn      *frtnPtr;
 
-  TRC1(SConvPhyPtr);
-
 
   /* check workPtr for NULLP */
   if ( (workPtr == NULLP) || (*workPtr == NULLP) )
@@ -6999,7 +6908,7 @@ PUBLIC S16 SConvPhyPtr (workPtr)
  *
  */
 #ifdef ANSI
-PUBLIC S16 SCpyFpaMsg
+S16 SCpyFpaMsg
 (
  Buffer *srcBuf,
  Region dstRegion,
@@ -7007,7 +6916,7 @@ PUBLIC S16 SCpyFpaMsg
  Buffer **dstBuf
  )
 #else
-PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
+S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
   Buffer *srcBuf;
   Region dstRegion;
   Pool dstPool;
@@ -7028,8 +6937,6 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
   SsDblk     *dblkPtr = NULLP;
   SsDblk     *dptr = NULLP;
 
-  TRC1(SCpyFpaMsg);
-
 
   if ( srcBuf == (Buffer*)NULLP )
   {
@@ -7154,13 +7061,13 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
  *
  */
 #ifdef ANSI
-PUBLIC S16 SCpyMsgFpa
+S16 SCpyMsgFpa
 (
  Buffer *srcBuf,
  Buffer **dstBuf
  )
 #else
-PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf)
+S16 SCpyMsgFpa (srcBuf, dstBuf)
   Buffer *srcBuf;
   Buffer **dstBuf;
 #endif
@@ -7178,8 +7085,6 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf)
   U32         numBytes;
   Pool        pool;
 
-  TRC1(SCpyMsgFpa);
-
 
   if (srcBuf == (Buffer*)NULLP)
   {
@@ -7337,12 +7242,12 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf)
  *
  */
 #ifdef ANSI
-PUBLIC S16 SPutFpaMsg
+S16 SPutFpaMsg
 (
  Buffer *fpaBuf
 )
 #else
-PUBLIC S16 SPutFpaMsg(fpaBuf)
+S16 SPutFpaMsg(fpaBuf)
 Buffer *fpaBuf;
 #endif
 {
@@ -7351,7 +7256,6 @@ Buffer *fpaBuf;
   Buffer   *nextBlk;
   SsDblk   *dblkPtr;
 
-  TRC1(SPutFpaMsg);
 
   if( fpaBuf == NULLP )
   {
@@ -7424,7 +7328,7 @@ Buffer *fpaBuf;
 */
 
 #ifdef ANSI
-PUBLIC S16 SCpyPartMsg
+S16 SCpyPartMsg
 (
 Buffer *srcBuf,
 MsgLen idx,
@@ -7432,7 +7336,7 @@ MsgLen cnt,
 Buffer *dstBuf
 )
 #else
-PUBLIC S16 SCpyPartMsg(srcBuf, idx, cnt, dstBuf)
+S16 SCpyPartMsg(srcBuf, idx, cnt, dstBuf)
 Buffer *srcBuf;
 MsgLen idx;
 MsgLen cnt;
@@ -7448,7 +7352,6 @@ Buffer *dstBuf;
    MsgLen    dCnt;
    MsgLen    numCpd;
  
-   TRC1(SCpyPartMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!srcBuf)
@@ -7591,7 +7494,7 @@ Buffer *dstBuf;
 */
 
 #ifdef ANSI
-PUBLIC S16 SRepPartMsg
+S16 SRepPartMsg
 (
 Buffer *srcBuf,
 MsgLen idx,
@@ -7599,7 +7502,7 @@ MsgLen cnt,
 Buffer *dstBuf
 )
 #else
-PUBLIC S16 SRepPartMsg(srcBuf, idx, cnt, dstBuf)
+S16 SRepPartMsg(srcBuf, idx, cnt, dstBuf)
 Buffer *srcBuf;
 MsgLen idx;
 MsgLen cnt;
@@ -7615,7 +7518,6 @@ Buffer *dstBuf;
    MsgLen     sIdx;
    MsgLen     cpBytes;
 
-   TRC1(SRepPartMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (!dstBuf)
@@ -7734,14 +7636,14 @@ Buffer *dstBuf;
 
 
 #ifdef ANSI
-PUBLIC S16 SMovPartMsg
+S16 SMovPartMsg
 (
 Buffer *srcBuf,              /* message 1 */
 MsgLen idx,                 /* index */
 Buffer *dstBuf              /* message 2 */
 )
 #else
-PUBLIC S16 SMovPartMsg(srcBuf, idx, dstBuf)
+S16 SMovPartMsg(srcBuf, idx, dstBuf)
 Buffer *srcBuf;              /* message 1 */
 MsgLen idx;                 /* index */
 Buffer *dstBuf;             /* message 2 */
@@ -7759,7 +7661,6 @@ Buffer *dstBuf;             /* message 2 */
    U32 line = __LINE__;
 #endif
 
-   TRC1(SMovPartMsg)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer 1 */
@@ -7909,14 +7810,14 @@ Buffer *dstBuf;             /* message 2 */
 */
  
 #ifdef ANSI
-PUBLIC S16 SPkMsgMult
+S16 SPkMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 SPkMsgMult(src, cnt, mBuf)
+S16 SPkMsgMult(src, cnt, mBuf)
 Data *src;
 MsgLen cnt;
 Buffer *mBuf;
@@ -7928,7 +7829,6 @@ Buffer *mBuf;
    MsgLen numBytes;  /* no. of bytes to be copied */
    MsgLen offset;
 
-   TRC1(SPkMsgMult)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check message buffer */
@@ -8021,14 +7921,14 @@ Buffer *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetReadPtr
+S16 SGetReadPtr
 (
  Buffer *mBuf, 
  U8** data, 
  MsgLen *len
 )
 #else
-PUBLIC S16 SGetReadPtr (mBuf, data, len)
+S16 SGetReadPtr (mBuf, data, len)
 Buffer *mBuf; 
 U8** data; 
 MsgLen *len;
@@ -8070,7 +7970,7 @@ MsgLen *len;
 */
 
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAttachPtrToBufNew
+S16 SAttachPtrToBufNew
 (
 Region   region,
 Pool     pool,
@@ -8082,7 +7982,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SAttachPtrToBuf
+S16 SAttachPtrToBuf
 (
 Region   region,
 Pool     pool,
@@ -8091,7 +7991,7 @@ MsgLen   totalLen,
 Buffer** mBuf
 )
 #else
-PUBLIC S16 SAttachPtrToBuf(region, pool, ptr, totalLen, mBuf)
+S16 SAttachPtrToBuf(region, pool, ptr, totalLen, mBuf)
 Region   region;
 Pool     pool;
 Data    *ptr;
@@ -8106,7 +8006,6 @@ Buffer** mBuf;
    Buffer    *newblk;
    /*   Void      *iccHdlr; */
 
-   TRC1(SAttachPtrToBuf)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (ptr == NULLP)
@@ -8209,7 +8108,6 @@ Buffer *buf;
    MsgLen          bufLen;
    S16             ret = ROK;
  
-   TRC2(SPutZbcDBuf);
  
    dptr = buf->b_datap; 
    /* Get the length of the buffer */
@@ -8318,7 +8216,7 @@ Buffer *buf;
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAttachPtrToMBuf1
+S16 SAttachPtrToMBuf1
 (
 Region   region,
 Pool     pool,
@@ -8331,7 +8229,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SAttachPtrToMBuf
+S16 SAttachPtrToMBuf
 (
 Region   region,
 Pool     pool,
@@ -8341,7 +8239,7 @@ MsgLen   ptrLen,
 Buffer** mBuf
 )
 #else
-PUBLIC S16 SAttachPtrToMBuf(region, pool, ptr, totalLen, ptrLen, mBuf)
+S16 SAttachPtrToMBuf(region, pool, ptr, totalLen, ptrLen, mBuf)
 Region   region;
 Pool     pool;
 Data    *ptr;
@@ -8357,7 +8255,6 @@ Buffer** mBuf;
    Buffer    *newblk;
    /*   Void      *iccHdlr; */
 
-   TRC1(SAttachPtrToMBuf)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (ptr == NULLP)
@@ -8417,7 +8314,7 @@ Buffer** mBuf;
    return ROK;
 }
 #endif /* INTEL_WLS */
-PUBLIC S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf)
+S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf)
 {
 #ifndef L2_OPTMZ 
   return (SAddMsgRef(srcBuf,dstRegion, dstPool,dstBuf));
@@ -8427,7 +8324,7 @@ PUBLIC S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dst
   return ROK;
 }
 #ifdef L2_OPTMZ
-PUBLIC Void SResetMBuf(Buffer *mbuf)
+Void SResetMBuf(Buffer *mbuf)
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -8474,7 +8371,7 @@ PUBLIC Void SResetMBuf(Buffer *mbuf)
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PUBLIC S16 SAttachWlsPtrToMBuf1
+S16 SAttachWlsPtrToMBuf1
 (
 Region   region,
 Pool     pool,
@@ -8488,7 +8385,7 @@ U32 line
 )
 #else
 #ifdef ANSI
-PUBLIC S16 SAttachWlsPtrToMBuf
+S16 SAttachWlsPtrToMBuf
 (
 Region   region,
 Pool     pool,
@@ -8499,7 +8396,7 @@ MsgLen   ptrLen,
 Buffer** mBuf
 )
 #else
-PUBLIC S16 SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, totalLen, ptrLen, mBuf)
+S16 SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, totalLen, ptrLen, mBuf)
 Region   region;
 Pool     pool;
 Data    *ptr;
@@ -8516,7 +8413,6 @@ Buffer** mBuf;
    Buffer    *newblk;
    /*   Void      *iccHdlr; */
 
-   TRC1(SAttachWlsPtrToMBuf)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (ptr == NULLP)
@@ -8580,7 +8476,7 @@ Buffer** mBuf;
 
 extern U32 numeTti;
 
-PUBLIC S16 SGetSBufDpdk
+S16 SGetSBufDpdk
 (
 Data **ptr,                     /* pointer to buffer */
 Size size                       /* size requested */
@@ -8593,7 +8489,7 @@ Size size                       /* size requested */
     return (ret);
 }
 
-PUBLIC S16 SPutSBufDpdk
+S16 SPutSBufDpdk
 (
 Data *ptr                     /* pointer to buffer */
 )
@@ -8606,7 +8502,7 @@ Data *ptr                     /* pointer to buffer */
     return (ret);
 }
 
-PUBLIC S16 SDetachDpdkPtrFrmDBuf
+S16 SDetachDpdkPtrFrmDBuf
 (
 Buffer     *mBuf,
 Data       **ptr
@@ -8630,7 +8526,7 @@ Data       **ptr
 }
 
 
-PUBLIC S16 SDetachDpdkPtrFrmMBuf
+S16 SDetachDpdkPtrFrmMBuf
 (
  Buffer     *mBuf,
  Data       **ptr
@@ -8669,7 +8565,7 @@ PUBLIC S16 SDetachDpdkPtrFrmMBuf
 
 
 #ifdef ANSI
-PUBLIC S16 SAttachDpdkPtrToMBuf
+S16 SAttachDpdkPtrToMBuf
 (
 Region   region,
 Pool     pool,
@@ -8680,7 +8576,7 @@ MsgLen   totalLen,
 Buffer** mBuf
 )
 #else
-PUBLIC S16 SAttachDpdkPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf)
+S16 SAttachDpdkPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf)
 Region   region;
 Pool     pool;
 Data    *ptr;