X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_msg.c;h=87e10376c3509803cca5db352b776c2d928bc137;hb=refs%2Fchanges%2F15%2F9315%2F5;hp=54dcdb678f7cfb11a9638bd64150a16bb821d738;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c
index 54dcdb678..87e10376c 100644
--- a/src/mt/ss_msg.c
+++ b/src/mt/ss_msg.c
@@ -92,7 +92,7 @@
 #include <pthread.h>
 #ifdef XEON_SPECIFIC_CHANGES
 uint32_t startMemLeak=0; 
-extern pthread_mutex_t  memLock;
+pthread_mutex_t  memLock;
 #endif
 
 #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF))
@@ -107,19 +107,19 @@ extern pthread_mutex_t  memLock;
 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 uint32_t GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
-EXTERN void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* 
+uint32_t GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
+void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* 
          file, uint32_t line, uint32_t size, void* ptr, uint32_t idx));
-EXTERN void FreeIdx ARGS((uint8_t* ptr, uint32_t idx, StaticMemAllocInfo*
+void FreeIdx ARGS((uint8_t* ptr, uint32_t idx, StaticMemAllocInfo*
          memAllocInfo,uint32_t size, char* file, uint32_t line));
 #endif
 
 #ifdef SS_USE_ZBC_MEMORY
 #ifdef T2K_MEM_LEAK_DBG
-PRIVATE S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,uint32_t));
+static S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,uint32_t));
 
 #else
-PRIVATE S16 SPutZbcDBuf ARGS((Region region, Buffer *buf));
+static S16 SPutZbcDBuf ARGS((Region region, Buffer *buf));
 S16 SAttachPtrToBuf ARGS(( Region   region, Pool     pool, Data    *ptr,
          MsgLen   totalLen, Buffer** mBuf));
 #endif
@@ -129,7 +129,7 @@ S16 SAttachPtrToBuf ARGS(( Region   region, Pool     pool, Data    *ptr,
 #ifdef SS_M_PROTO_REGION 
 #ifdef T2K_MEM_LEAK_DBG
 #define DupMsg(region,buffer) DupMsgNew(region,buffer,file,line)
-PRIVATE Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,uint32_t));
+static Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,uint32_t));
 #else
 #ifdef INTEL_WLS
 #ifdef T2K_MEM_LEAK_DBG
@@ -157,7 +157,7 @@ S16 SPutSBufDpdk          ARGS(( Data    *ptr));
 
 #endif /* INTEL_WLS */
 
-PRIVATE Buffer *DupMsg ARGS((Region region, Buffer *buffer));
+static Buffer *DupMsg ARGS((Region region, Buffer *buffer));
 #endif
 #endif /* SS_M_PROTO_REGION */
 
@@ -213,7 +213,7 @@ PRIVATE Buffer *DupMsg ARGS((Region region, Buffer *buffer));
 }
 
 
-EXTERN pthread_t tmpRegTidMap[20];
+pthread_t tmpRegTidMap[20];
 #define CM_MEM_GET_REGION(_region)                        \
 {                                                         \
    uint8_t  _regCnt;                                           \
@@ -230,7 +230,7 @@ EXTERN pthread_t tmpRegTidMap[20];
 }
 
 #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF) || defined(L2_OPTMZ))
-extern S32 clusterMode;
+S32 clusterMode;
 #endif
 /*
 *
@@ -260,19 +260,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 ssGetDBufOfSize
 (
 Region region,
 Size size,
 Buffer **dBuf
 )
-#else
-S16 ssGetDBufOfSize(region, size, dBuf)
-Region region;
-Size size;
-Buffer **dBuf;
-#endif
 #endif
 {
    Size mdsize;
@@ -348,7 +341,6 @@ Buffer **dBuf;
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SGetMsgNew
 (
 Region region,              /* region id */
@@ -357,14 +349,6 @@ Buffer **mBuf,              /* pointer to message buffer */
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SGetMsgNew(region, pool, mBuf, line, fileName)
-Region region;              /* region id */
-Pool pool;                  /* pool id */
-Buffer **mBuf;              /* pointer to message buffer */
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #ifdef T2K_MEM_LEAK_DBG
 S16 SGetMsgNew
@@ -376,19 +360,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SGetMsg
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
 Buffer **mBuf              /* pointer to message buffer */
 )
-#else
-S16 SGetMsg(region, pool, mBuf)
-Region region;              /* region id */
-Pool pool;                  /* pool id */
-Buffer **mBuf;              /* pointer to message buffer */
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -577,19 +554,12 @@ S16 SSetMBufPool(Buffer *mBuf, Pool pool)
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SPutMsgNew
 (
 Buffer *mBuf,
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SPutMsgNew(mBuf, line, fileName)
-Buffer *mBuf;
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #ifdef T2K_MEM_LEAK_DBG
 S16 SPutMsgNew
@@ -599,15 +569,10 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SPutMsg
 (
 Buffer *mBuf
 )
-#else
-S16 SPutMsg(mBuf)
-Buffer *mBuf;
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -638,8 +603,8 @@ Buffer *mBuf;
 #endif
 #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF))
    {
-      extern pthread_t gMacTId,gRlcTId;
-      extern S32 clusterMode;
+      pthread_t gMacTId,gRlcTId;
+      S32 clusterMode;
       if(clusterMode == RADIO_CLUSTER_MODE)
       {
 
@@ -684,7 +649,9 @@ Buffer *mBuf;
    CM_MEM_GET_REGION(tmpThrReg)
    if(tmpThrReg == 0xFF)
    {
+#ifdef ERROR_PRINT
       printf("\n Not able to get region \n");
+#endif
       return RFAILED;
    }
 #endif
@@ -763,7 +730,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SPutStaticBuffer
 (
 Region region,                  /* region ID */
@@ -772,14 +738,6 @@ Data *ptr,                      /* pointer to buffer */
 Size size,                      /* size */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SPutStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 #endif
 {
    S16 ret = RFAILED;
@@ -814,7 +772,7 @@ uint8_t   memType;                   /* memory type used if shareable or not */
 #endif
 #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF))
    {
-      extern pthread_t gMacTId,gRlcTId;
+      pthread_t gMacTId,gRlcTId;
 
       if(clusterMode == RADIO_CLUSTER_MODE)
       {
@@ -916,7 +874,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SGetStaticBuffer
 (
 Region region,                  /* region ID */
@@ -925,14 +882,6 @@ Data **ptr,                     /* pointer to buffer */
 Size size,                      /* size requested */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SGetStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 #endif
 {
    S16 ret = RFAILED;
@@ -1017,9 +966,8 @@ uint8_t   memType;                   /* memory type used if shareable or not */
 }
 #endif /* SS_LOCKLESS_MEMORY */
 
-#ifdef INTEL_WLS 
+#ifdef INTEL_WLS_MEM 
 #ifndef SS_LOCKLESS_MEMORY
-#ifdef ANSI
 S16 SGetStaticBuffer
 (
 Region region,                  /* region ID */
@@ -1028,14 +976,6 @@ Data **ptr,                     /* pointer to buffer */
 Size size,                      /* size requested */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SGetStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 {
     S16  ret;
 
@@ -1045,7 +985,6 @@ uint8_t   memType;                   /* memory type used if shareable or not */
 }
 
 
-#ifdef ANSI
 S16 SPutStaticBuffer
 (
 Region region,                  /* region ID */
@@ -1054,14 +993,6 @@ Data *ptr,                      /* pointer to buffer */
 Size size,                      /* size */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SPutStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 {
 
    S16   ret;
@@ -1173,7 +1104,6 @@ Size size                      /* size */
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 S16 SGetSBufNew
 (
 Region region,                  /* region ID */
@@ -1183,18 +1113,8 @@ Size size,                       /* size requested */
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SGetSBufNew(region, pool, ptr, size, line, fileName)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG))
-#ifdef ANSI
 S16 SGetSBuf1
 (
 Region region,                  /* region ID */
@@ -1205,16 +1125,6 @@ char* file,
 uint32_t line
 )
 #else
-S16 SGetSBuf1(region, pool, ptr, size, file, line)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-char* file;
-uint32_t line;
-#endif
-#else
-#ifdef ANSI
 S16 SGetSBuf
 (
 Region region,                  /* region ID */
@@ -1222,13 +1132,6 @@ Pool pool,                      /* pool ID */
 Data **ptr,                     /* pointer to buffer */
 Size size                       /* size requested */
 )
-#else
-S16 SGetSBuf(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -1368,7 +1271,7 @@ Size size;                      /* size requested */
 #endif
    /*size = tmpSize - 4;*/
    {
-      /*printf("ptr = %p *ptr = %p\n",ptr,*ptr);*/
+      /*printf("\nptr = %p *ptr = %p\n",ptr,*ptr);*/
 #ifdef XEON_SPECIFIC_CHANGES
       pthread_mutex_lock(&(memLock));
 #endif      
@@ -1379,7 +1282,7 @@ Size size;                      /* size requested */
       /* store the index in the memory allocated itself */
       /**((uint32_t*)*((uint32_t*)allocatedPtr)) = idx;*/
       *((uint32_t*)allocatedPtr) = idx;
-      /*printf("region = %d idx = %d ptr = %p *ptr = %p actual = %p allocated = %p content = %d\n",region, idx, ptr, *ptr, actualPtr, allocatedPtr, *((uint32_t*)allocatedPtr));*/
+      /*printf("\nregion = %d idx = %d ptr = %p *ptr = %p actual = %p allocated = %p content = %d\n",region, idx, ptr, *ptr, actualPtr, allocatedPtr, *((uint32_t*)allocatedPtr));*/
 
       LogForStaticMemLeak(&SMemLeakInfo[region],
                           file,
@@ -1449,7 +1352,6 @@ Size size;                      /* size requested */
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 S16 SPutSBufNew
 (
 Region region,                  /* region ID */
@@ -1459,18 +1361,8 @@ Size size,                      /* size */
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SPutSBufNew(region, pool, ptr, size, line, fileName)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else  /* SS_HISTOGRAM_SUPPORT  */
 #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG))
-#ifdef ANSI
 S16 SPutSBuf1
 (
 Region region,                  /* region ID */
@@ -1481,16 +1373,6 @@ char* file,
 uint32_t line
 )
 #else
-S16 SPutSBuf1(region, pool, ptr, size, file, line)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-char* file;
-uint32_t line;
-#endif
-#else
-#ifdef ANSI
 S16 SPutSBuf
 (
 Region region,                  /* region ID */
@@ -1498,13 +1380,6 @@ Pool pool,                      /* pool ID */
 Data *ptr,                      /* pointer to buffer */
 Size size                      /* size */
 )
-#else
-S16 SPutSBuf(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -1678,15 +1553,7 @@ Size size;                      /* size */
 *
 */
 
-#ifdef ANSI
-S16 SInitMsg
-(
-Buffer *mBuf
-)
-#else
-S16 SInitMsg(mBuf)
-Buffer *mBuf;
-#endif
+S16 SInitMsg(Buffer *mBuf)
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -1767,19 +1634,12 @@ Buffer *mBuf;
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SAddPreMsgMultInOrder
 (
- Data *src,
- MsgLen cnt,
- Buffer *mBuf
- )
-#else
-S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
-    Data *src;
-    MsgLen cnt;
-    Buffer *mBuf;
-#endif
+Data *src,
+MsgLen cnt,
+Buffer *mBuf
+)
 {
    SsMsgInfo *minfo;   /* Message info */
    Buffer *tmp;
@@ -1955,17 +1815,11 @@ S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
 */
 
  
-#ifdef ANSI
 S16 SAddPreMsg
 (
 Data data,
 Buffer *mBuf
 )
-#else
-S16 SAddPreMsg (data, mBuf)
-Data data;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2057,17 +1911,11 @@ Buffer *mBuf;
 */
 
  
-#ifdef ANSI
 S16 SAddPstMsg
 (
 Data data,
 Buffer *mBuf
 )
-#else
-S16 SAddPstMsg (data, mBuf)
-Data data;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2158,19 +2006,12 @@ uint32_t    line
 )
 
 #else
-#ifdef ANSI
 S16 SAddPreMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
-#else
-S16 SAddPreMsgMult(src, cnt, mBuf)
-Data *src;
-MsgLen cnt;
-Buffer *mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -2334,19 +2175,12 @@ char   *file,
 uint32_t    line
 )
 #else
-#ifdef ANSI
 S16 SAddPstMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
-#else
-S16 SAddPstMsgMult(src, cnt, mBuf)
-Data *src;
-MsgLen cnt;
-Buffer *mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;
@@ -2509,17 +2343,11 @@ Buffer *mBuf;
 */
 
  
-#ifdef ANSI
 S16 SRemPreMsg
 (
 Data *dataPtr,
 Buffer *mBuf
 )
-#else
-S16 SRemPreMsg(dataPtr, mBuf)
-Data *dataPtr;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2594,17 +2422,11 @@ Buffer *mBuf;
 */
 
 
-#ifdef ANSI
 S16 SRemPstMsg
 (
 Data *dataPtr,              /* pointer to data */
 Buffer *mBuf
 )
-#else
-S16 SRemPstMsg(dataPtr, mBuf)
-Data *dataPtr;              /* pointer to data */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2694,23 +2516,16 @@ Buffer *mBuf;               /* message buffer */
 *
 */
 
-#ifdef ANSI
 S16 SRemPreMsgMult
 (
 Data *dst,                  /* destination */
 MsgLen cnt,                 /* count */
 Buffer *mBuf
 )
-#else
-S16 SRemPreMsgMult(dst, cnt, mBuf)
-Data *dst;                  /* destination */
-MsgLen cnt;                 /* count */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   SsMsgInfo *minfo;
-   Buffer *tmp;
-   MsgLen numBytes;
+   SsMsgInfo *minfo = NULLP;
+   Buffer *tmp = NULLP;
+   MsgLen numBytes =0;
 #ifdef T2K_MEM_LEAK_DBG
    char* file = __FILE__;
    uint32_t line = __LINE__;
@@ -2816,19 +2631,12 @@ Buffer *mBuf;               /* message buffer */
 *
 */
 
-#ifdef ANSI
 S16 SRemPstMsgMult
 (
 Data *dst,                  /* destination */
 MsgLen cnt,                 /* count */
 Buffer *mBuf
 )
-#else
-S16 SRemPstMsgMult(dst, cnt, mBuf)
-Data *dst;                  /* destination */
-MsgLen cnt;                 /* count */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2950,19 +2758,12 @@ Buffer *mBuf;               /* message buffer */
 */
 
 
-#ifdef ANSI
 S16 SExamMsg
 (
 Data *dataPtr,              /* pointer to data */
 Buffer *mBuf,               /* message buffer */
 MsgLen idx
 )
-#else
-S16 SExamMsg(dataPtr, mBuf, idx)
-Data *dataPtr;              /* pointer to data */
-Buffer *mBuf;               /* message buffer */
-MsgLen idx;                 /* index */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -3043,7 +2844,6 @@ MsgLen idx;                 /* index */
 */
 
 
-#ifdef ANSI
 S16 SGetDataFrmMsg 
 (
 Buffer *mBuf,               /* message buffer */
@@ -3051,13 +2851,6 @@ Data *dataPtr,              /* pointer to data */
 MsgLen idx,
 MsgLen dataLen
 )
-#else
-S16 SGetDataFrmMsg(mBuf, dataPtr, idx, dataLen)
-Buffer *mBuf;               /* message buffer */
-Data *dataPtr;              /* pointer to data */
-MsgLen idx;                 /* index */
-MsgLen dataLen;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -3149,17 +2942,11 @@ MsgLen dataLen;
 */
 
 
-#ifdef ANSI
 S16 SFndLenMsg
 (
 REG1 Buffer *mBuf,          /* message buffer */
 MsgLen *lngPtr
 )
-#else
-S16 SFndLenMsg(mBuf, lngPtr)
-REG1 Buffer *mBuf;          /* message buffer */
-MsgLen *lngPtr;             /* pointer to length */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -3242,19 +3029,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SSegMsg
 (
 Buffer *mBuf1,              /* message 1 */
 MsgLen idx,                 /* index */
 Buffer **mBuf2
 )
-#else
-S16 SSegMsg(mBuf1, idx, mBuf2)
-Buffer *mBuf1;              /* message 1 */
-MsgLen idx;                 /* index */
-Buffer **mBuf2;             /* message 2 */
-#endif
 #endif
 {
    SsMsgInfo *minfo1;
@@ -3439,7 +3219,6 @@ Buffer **mBuf2;             /* message 2 */
 *
 */
 
-#ifdef ANSI
 S16 SCpyFixMsg
 (
 Data *srcBuf,               /* source buffer */
@@ -3448,14 +3227,6 @@ MsgLen dstIdx,              /* destination index */
 MsgLen cnt,                 /* count */
 MsgLen *cCnt
 )
-#else
-S16 SCpyFixMsg(srcBuf, dstMbuf, dstIdx, cnt, cCnt)
-Data *srcBuf;               /* source buffer */
-Buffer *dstMbuf;            /* destination message buffer */
-MsgLen dstIdx;              /* destination index */
-MsgLen cnt;                 /* count */
-MsgLen *cCnt;               /* copied count */
-#endif
 {
    S16 ret;
    SsMsgInfo *minfo;
@@ -3592,7 +3363,6 @@ MsgLen *cCnt;               /* copied count */
 *
 */
 
-#ifdef ANSI
 S16 SCpyMsgFix
 (
 Buffer *srcMbuf,            /* source message buffer */
@@ -3601,19 +3371,11 @@ MsgLen cnt,                 /* count */
 Data *dstBuf,               /* destination buffer */
 MsgLen *cCnt
 )
-#else
-S16 SCpyMsgFix(srcMbuf, srcIdx, cnt, dstBuf, cCnt)
-Buffer *srcMbuf;            /* source message buffer */
-MsgLen srcIdx;              /* source index */
-MsgLen cnt;                 /* count */
-Data *dstBuf;               /* destination buffer */
-MsgLen *cCnt;               /* copied count */
-#endif
 {
-   Data *cptr;
-   Buffer *tmp;
-   SsMsgInfo *minfo;
-   MsgLen numBytes;
+   Data *cptr = NULLP;
+   Buffer *tmp = NULLP;
+   SsMsgInfo *minfo = NULLP;
+   MsgLen numBytes =0;
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check source message buffer */
@@ -3730,7 +3492,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SCpyMsgMsg
 (
 Buffer *srcBuf,
@@ -3738,13 +3499,6 @@ Region dstRegion,
 Pool dstPool,
 Buffer **dstBuf
 )
-#else
-S16 SCpyMsgMsg(srcBuf, dstRegion, dstPool, dstBuf)
-Buffer *srcBuf;
-Region dstRegion;
-Pool dstPool;
-Buffer **dstBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo1;
@@ -3879,7 +3633,9 @@ Buffer **dstBuf;
                (Void) SPutDBuf(minfo1->region, minfo1->pool, newblk);
                newblk = curblk;
             }
-            printf("Failed to get the buffer of size %s %d\n", __FILE__, __LINE__);
+#ifdef ERROR_PRINT
+            printf("\nFailed to get the buffer of size %s %d\n", __FILE__, __LINE__);
+#endif            
             (Void) SPutMsg(*dstBuf);
             return (ROUTRES);
          }
@@ -3931,7 +3687,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAddMsgRef
 (
 Buffer *srcBuf,
@@ -3939,13 +3694,6 @@ Region dstRegion,
 Pool dstPool,
 Buffer **dstBuf
 )
-#else
-S16 SAddMsgRef(srcBuf, dstRegion, dstPool, dstBuf)
-Buffer *srcBuf;
-Region dstRegion;
-Pool dstPool;
-Buffer **dstBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo1;
@@ -4085,7 +3833,7 @@ Buffer **dstBuf;
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-PRIVATE Buffer *DupMsgNew
+static Buffer *DupMsgNew
 (
 Region region,              /* region id */
 Buffer *mp,                  /* message block */
@@ -4093,17 +3841,11 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
-PRIVATE Buffer *DupMsg
+static Buffer *DupMsg
 (
 Region region,              /* region id */
 Buffer *mp                  /* message block */
 )
-#else
-PRIVATE Buffer *DupMsg(region, mp)
-Region region;              /* region id */
-Buffer *mp;                 /* message block */
-#endif
 #endif
 {
    Buffer *bp;                  /* mblk for iteration */
@@ -4224,19 +3966,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SGetDBuf
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
 Buffer **bufPtr
 )
-#else
-S16 SGetDBuf(region, pool, bufPtr)
-Region region;              /* region id */
-Pool pool;                  /* pool id */
-Buffer **bufPtr;            /* pointer to buffer */
-#endif
 #endif
 {
    Size size;
@@ -4369,7 +4104,9 @@ Buffer **bufPtr;            /* pointer to buffer */
 #ifndef SS_DBUF_REFLOCK_DISABLE
    if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0)
    {
-      printf("Falied to destroy lock\n");
+#ifdef ERROR_PRINT
+      printf("\nFalied to destroy lock\n");
+#endif
    }
 #endif
 
@@ -4407,26 +4144,19 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SPutDBuf
 (
 Region region,
 Pool pool,
 Buffer *buf
 )
-#else
-S16 SPutDBuf(region, pool, buf)
-Region region;
-Pool pool;
-Buffer *buf;
-#endif
 #endif
 {
-   register SsDblk *dptr;
+   register SsDblk *dptr = NULLP;
    /* ss021.103 - Addition to check return value of SFree */
-   S16 ret;
+   S16 ret = ROK;
 #if (defined(SS_USE_ZBC_MEMORY) && defined (TENB_DPDK_BUF))
-   Data  *dpdkBuf;
+   Data  *dpdkBuf = NULLP;
 #endif   
  
  
@@ -4533,7 +4263,9 @@ Buffer *buf;
         ret = SUnlock(&dptr->dBufLock) ;
         if((SDestroyLock(&dptr->dBufLock)) != 0)
         {
-            printf("Falied to destroy lock\n");
+#ifdef ERROR_PRINT
+            printf("\nFalied to destroy lock\n");
+#endif
         }
 #endif
       /* free buffer to region */
@@ -4592,19 +4324,12 @@ Buffer *buf;
 */
 
 
-#ifdef ANSI
 S16 SCatMsg
 (
 Buffer *mBuf1,              /* message 1 */
 Buffer *mBuf2,              /* message 2 */
 Order order
 )
-#else
-S16 SCatMsg(mBuf1, mBuf2, order)
-Buffer *mBuf1;              /* message 1 */
-Buffer *mBuf2;              /* message 2 */
-Order order;                /* order */
-#endif
 {
    SsMsgInfo *minfo1;
    SsMsgInfo *minfo2;
@@ -4751,19 +4476,12 @@ Order order;                /* order */
 */
 
 
-#ifdef ANSI
 S16 SRepMsg
 (
 Data data,                  /* data */
 Buffer *mBuf,               /* message buffer */
 MsgLen idx
 )
-#else
-S16 SRepMsg(data, mBuf, idx)
-Data data;                  /* data */
-Buffer *mBuf;               /* message buffer */
-MsgLen idx;                 /* index */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -4852,19 +4570,12 @@ MsgLen idx;                 /* index */
 */
 
 
-#ifdef ANSI
 S16 SUpdMsg
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer *dBuf,                   /* data buffer */
 MsgLen dLen
 )
-#else
-S16 SUpdMsg(mBuf, dBuf, dLen)
-Buffer *mBuf;                   /* message buffer */
-Buffer *dBuf;                   /* data buffer */
-MsgLen dLen;                    /* data length */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -4943,17 +4654,11 @@ MsgLen dLen;                    /* data length */
 */
 
  
-#ifdef ANSI
 S16 SAddDBufPst
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer *dBuf
 )
-#else
-S16 SAddDBufPst(mBuf, dBuf)
-Buffer *mBuf;                   /* message buffer */
-Buffer *dBuf;                   /* data buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5014,17 +4719,11 @@ Buffer *dBuf;                   /* data buffer */
 */
 
  
-#ifdef ANSI
 S16 SAddDBufPre
 (
 Buffer *mBuf,                    /* message buffer */
 Buffer *dBuf
 )
-#else
-S16 SAddDBufPre(mBuf, dBuf)
-Buffer *mBuf;                    /* message buffer */
-Buffer *dBuf;                    /* data buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -5088,17 +4787,11 @@ Buffer *dBuf;                    /* data buffer */
 */
 
  
-#ifdef ANSI
 S16 SRemDBufPre
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBufPtr
 )
-#else
-S16 SRemDBufPre(mBuf, dBufPtr)
-Buffer *mBuf;                   /* message buffer */
-Buffer **dBufPtr;               /* pointer to data buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5163,17 +4856,11 @@ Buffer **dBufPtr;               /* pointer to data buffer */
 */
 
  
-#ifdef ANSI
 S16 SRemDBufPst
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBufPtr
 )
-#else
-S16 SRemDBufPst(mBuf, dBufPtr)
-Buffer *mBuf;                   /* message buffer */
-Buffer **dBufPtr;               /* pointer to data buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -5235,15 +4922,10 @@ Buffer **dBufPtr;               /* pointer to data buffer */
 */
 
  
-#ifdef ANSI
 S16 SInitNxtDBuf
 (
 Buffer *mBuf
 )
-#else
-S16 SInitNxtDBuf(mBuf)
-Buffer *mBuf;                   /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5284,17 +4966,11 @@ Buffer *mBuf;                   /* message buffer */
 */
 
  
-#ifdef ANSI
 S16 SGetNxtDBuf
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBuf
 )
-#else
-S16 SGetNxtDBuf(mBuf, dBuf)
-Buffer *mBuf;                   /* message buffer */
-Buffer **dBuf;                  /* data buffer return */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5343,15 +5019,10 @@ Buffer **dBuf;                  /* data buffer return */
 *
 */
 
-#ifdef ANSI
 S16 SChkNxtDBuf
 (
 Buffer *mBuf
 )
-#else
-S16 SChkNxtDBuf(mBuf)
-Buffer *mBuf;                   /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5396,7 +5067,6 @@ Buffer *mBuf;                   /* message buffer */
 */
 
  
-#ifdef ANSI
 S16 SGetDataRx
 (
 Buffer *dBuf,                   /* data buffer */
@@ -5404,13 +5074,6 @@ MsgLen pad,                     /* pad */
 Data **retDatPtr,               /* return data pointer */
 MsgLen *retDatLen
 )
-#else
-S16 SGetDataRx(dBuf, pad, retDatPtr, retDatLen)
-Buffer *dBuf;                   /* data buffer */
-MsgLen pad;                     /* pad */
-Data **retDatPtr;               /* return data pointer */
-MsgLen *retDatLen;              /* return data length */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -5479,19 +5142,12 @@ MsgLen *retDatLen;              /* return data length */
 */
 
  
-#ifdef ANSI
 S16 SGetDataTx
 (
 Buffer *dBuf,                   /* data buffer */
 Data **retDatPtr,               /* return data pointer */
 MsgLen *retDatLen               /* return data length */
 )
-#else
-S16 SGetDataTx(dBuf, retDatPtr, retDatLen)
-Buffer *dBuf;                   /* data buffer */
-Data **retDatPtr;               /* return data pointer */
-MsgLen *retDatLen;              /* return data length */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -5552,19 +5208,12 @@ MsgLen *retDatLen;              /* return data length */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetBufRegionPool
 (
 Buffer *mBuf,                   /* message buffer */
 Region *region,                 /* region */
 Pool   *pool                    /* pool */
 )
-#else
-S16 SGetBufRegionPool(mBuf, region, pool)
-Buffer *mBuf;                   /* message buffer */
-Region *region;                 /* region */
-Pool   *pool;                   /* pool */
-#endif
 {
    SsMsgInfo *mInfo;            /* message info pointer */
 
@@ -5629,15 +5278,10 @@ Pool   *pool;                   /* pool */
 */
 
  
-#ifdef ANSI
 S16 SCompressMsg
 (
 Buffer *mBuf
 )
-#else
-S16 SCompressMsg(mBuf)
-Buffer *mBuf;                    /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    MsgLen numBytes;
@@ -5726,36 +5370,29 @@ Buffer *mBuf;                    /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPrntMsg
 (
 Buffer *mBuf,               /* message buffer */
 S16 src,                    /* source id */
 S16 dst                     /* destination id */
 )
-#else
-S16 SPrntMsg(mBuf, src, dst)
-Buffer *mBuf;               /* message buffer */
-S16 src;                    /* source id */
-S16 dst;                    /* destination id */
-#endif
 {
-   QLen qlen;               /* queue length */
-	MsgLen mlen;             /* message length */
+   QLen qlen =0;               /* queue length */
+   MsgLen mlen =0;             /* message length */
 /*
  * SDeRegTTsk patch
  */
 	/* ss038.103 : 102061 Changed to MsgLen from S16 */
-	MsgLen i;                /* counter */
-	S16 j;                   /* counter */
-   S16 k;                   /* counter */
-   uint8_t data;                 /* data */
+   MsgLen i =0;                /* counter */
+   S16 j =0;                   /* counter */
+   S16 k =0;                   /* counter */
+   uint8_t data =0;                 /* data */
    uint8_t tdata[16] = {0};            /* temporary data */
-   S8 prntBuf[256];         /* print buffer */
-   Buffer *tmp;             /* buffer ptr */
-   Data *cptr;
+   S8 prntBuf[256] ={0};         /* print buffer */
+   Buffer *tmp = NULLP;             /* buffer ptr */
+   Data *cptr =NULLP;
 /* ss012.13: Addition */
-   Data reg;
+   Data reg =0;
 
 
 
@@ -5772,6 +5409,7 @@ S16 dst;                    /* destination id */
    mlen = ((SsMsgInfo*)(mBuf->b_rptr))->len;
    reg = ((SsMsgInfo*)(mBuf->b_rptr))->region;
    /*ss013.301: Fixed Warnings for 32/64 bit compilation*/
+#ifdef DEBUG_PRINT
    sprintf(prntBuf,"\nmsg: qlen: %04d mlen: %04d   %02d-->%02d region: %02d\n",
            (uint16_t)qlen,(uint16_t)mlen,src,dst,reg);
    SPrint( prntBuf);
@@ -5781,6 +5419,7 @@ S16 dst;                    /* destination id */
    SPrint((S8*) "dat: ");
 #ifdef XEON_SPECIFIC_CHANGES
    printf("\ndat: ");
+#endif   
 #endif   
 
    if (mlen == 0)
@@ -5804,9 +5443,11 @@ S16 dst;                    /* destination id */
             /* print hex */
             tdata[j]=data;
             sprintf( prntBuf,"%02x ",(uint16_t) data);
+#ifdef DEBUG_PRINT
             SPrint( prntBuf);
 #ifdef XEON_SPECIFIC_CHANGES
    printf("%s\n", prntBuf);
+#endif
 #endif   
             if (cptr == tmp->b_wptr)
             {
@@ -5822,9 +5463,11 @@ S16 dst;                    /* destination id */
          else
          {
             sprintf( prntBuf,"   ");
+#ifdef DEBUG_PRINT
             SPrint( prntBuf );
 #ifdef XEON_SPECIFIC_CHANGES
    printf("%s\n", prntBuf);
+#endif
 #endif   
          }
       } 
@@ -5836,25 +5479,31 @@ S16 dst;                    /* destination id */
          {
             /* print character if printable */
             sprintf(prntBuf,"%c",tdata[k]);
+#ifdef DEBUG_PRINT
             SPrint( prntBuf);
 #ifdef XEON_SPECIFIC_CHANGES
    printf("%s\n", prntBuf);
+#endif
 #endif   
          }
          else
          {
             /* print . if non printable */
+#ifdef DEBUG_PRINT
             SPrint((S8*) ".");
 #ifdef XEON_SPECIFIC_CHANGES
    printf(".");
 #endif   
+#endif
          }
       }
       sprintf(prntBuf,"\n     ");
+#ifdef DEBUG_PRINT
       SPrint(prntBuf);
 #ifdef XEON_SPECIFIC_CHANGES
    printf("%s\n", prntBuf);
 #endif   
+#endif
    }
    return ROK;
 
@@ -5883,17 +5532,11 @@ S16 dst;                    /* destination id */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetPstMsgMult
 (
 MsgLen cnt,                 /* count */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SGetPstMsgMult(cnt, mBuf)
-MsgLen cnt;                 /* count */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Buffer *tmp;
    Buffer *newb;
@@ -5987,15 +5630,10 @@ Buffer *mBuf;               /* message buffer */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SChkMsg
 (
 Buffer *mBuf
 )
-#else
-S16 SChkMsg(mBuf)
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -6041,15 +5679,10 @@ Buffer *mBuf;
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SAlignDBufEven
 (
 Buffer *dBuf                      /* data buffer */
 )
-#else
-S16 SAlignDBufEven(dBuf)
-Buffer *dBuf;                   /* data buffer  */
-#endif
 {
    MsgLen len;
    Data *src;
@@ -6114,17 +5747,11 @@ Buffer *dBuf;                   /* data buffer  */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SAlignDBuf
 (
 Buffer *dBuf,                      /* data buffer */
 uint32_t    align                       /* alignemnt required */
 )
-#else
-S16 SAlignDBuf(dBuf, align)
-Buffer *dBuf;                      /* data buffer  */
-uint32_t    align;                      /* alignemnt required */
-#endif
 {
    MsgLen len;
    Data   *src;
@@ -6205,19 +5832,12 @@ uint32_t    align;                      /* alignemnt required */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetSMem
 (
 Region region,                  /* region ID */
 Size size,                      /* size */
 Pool *pool                      /* pointer to pool ID */
 )
-#else
-S16 SGetSMem(region, size, pool)
-Region region;                  /* region ID */
-Size size;                      /* size */
-Pool *pool;                     /* pointer to pool ID */
-#endif
 {
 
    UNUSED(size);
@@ -6264,17 +5884,11 @@ Pool *pool;                     /* pointer to pool ID */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SPutSMem
 (
 Region region,                  /* region ID */
 Pool pool                       /* pool ID */
 )
-#else
-S16 SPutSMem(region, pool)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-#endif
 {
    /* ss021.103 - Addition of return value */
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -6358,19 +5972,12 @@ Pool pool;                      /* pool ID */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SChkRes
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
 Status *status                  /* pointer to status */
 )
-#else
-S16 SChkRes(region, pool, status)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Status *status;                 /* pointer to status */
-#endif
 {
    S16 ret;
    SMemCtl mctl;
@@ -6484,17 +6091,11 @@ Status *status;                 /* pointer to status */
 */
 
 
-#ifdef ANSI
 S16 SSwapMsg
 (
 Buffer *mBuf1,              /* message 1 */
 Buffer *mBuf2               /* message 2 */
 )
-#else
-S16 SSwapMsg(mBuf1, mBuf2)
-Buffer *mBuf1;              /* message 1 */
-Buffer *mBuf2;              /* message 2 */
-#endif
 {
    SsMsgInfo *minfop;
    SsMsgInfo minfo;
@@ -6595,15 +6196,10 @@ Buffer *mBuf2;              /* message 2 */
  *       File:  ss_msg.c
  *
  */
-#ifdef ANSI
 S16 SConvPtrPhy
 (
  Buffer  **mBuf
 )
-#else
-S16 SConvPtrPhy (mBuf)
-  Buffer **mBuf;
-#endif
 {
 
   Buffer      *curPtr;
@@ -6751,15 +6347,10 @@ S16 SConvPtrPhy (mBuf)
  *       File:  ss_msg.c
  *
  */
-#ifdef ANSI
 S16 SConvPhyPtr
 (
- Buffer  **workPtr
- )
-#else
-S16 SConvPhyPtr (workPtr)
-  Buffer  **workPtr;
-#endif
+Buffer  **workPtr
+)
 {
 
   Buffer      *curPtr;
@@ -6907,21 +6498,13 @@ S16 SConvPhyPtr (workPtr)
  *       File:
  *
  */
-#ifdef ANSI
 S16 SCpyFpaMsg
 (
- Buffer *srcBuf,
- Region dstRegion,
- Pool dstPool,
- Buffer **dstBuf
- )
-#else
-S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
-  Buffer *srcBuf;
-  Region dstRegion;
-  Pool dstPool;
-  Buffer **dstBuf;
-#endif
+Buffer *srcBuf,
+Region dstRegion,
+Pool dstPool,
+Buffer **dstBuf
+)
 {
 
   Size        numBytes;
@@ -7060,17 +6643,11 @@ S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
  *       File:
  *
  */
-#ifdef ANSI
 S16 SCpyMsgFpa
 (
- Buffer *srcBuf,
- Buffer **dstBuf
- )
-#else
-S16 SCpyMsgFpa (srcBuf, dstBuf)
-  Buffer *srcBuf;
-  Buffer **dstBuf;
-#endif
+Buffer *srcBuf,
+Buffer **dstBuf
+)
 {
 
   Buffer     *curPtr = NULLP;
@@ -7241,15 +6818,10 @@ S16 SCpyMsgFpa (srcBuf, dstBuf)
  *       File:
  *
  */
-#ifdef ANSI
 S16 SPutFpaMsg
 (
- Buffer *fpaBuf
+Buffer *fpaBuf
 )
-#else
-S16 SPutFpaMsg(fpaBuf)
-Buffer *fpaBuf;
-#endif
 {
   uint16_t      size;
   Buffer   *curBlk;
@@ -7327,7 +6899,6 @@ Buffer *fpaBuf;
 *
 */
 
-#ifdef ANSI
 S16 SCpyPartMsg
 (
 Buffer *srcBuf,
@@ -7335,13 +6906,6 @@ MsgLen idx,
 MsgLen cnt,
 Buffer *dstBuf
 )
-#else
-S16 SCpyPartMsg(srcBuf, idx, cnt, dstBuf)
-Buffer *srcBuf;
-MsgLen idx;
-MsgLen cnt;
-Buffer *dstBuf;
-#endif
 {
    SsMsgInfo *sMinfo;
    SsMsgInfo *dMinfo;
@@ -7493,7 +7057,6 @@ Buffer *dstBuf;
 *
 */
 
-#ifdef ANSI
 S16 SRepPartMsg
 (
 Buffer *srcBuf,
@@ -7501,13 +7064,6 @@ MsgLen idx,
 MsgLen cnt,
 Buffer *dstBuf
 )
-#else
-S16 SRepPartMsg(srcBuf, idx, cnt, dstBuf)
-Buffer *srcBuf;
-MsgLen idx;
-MsgLen cnt;
-Buffer *dstBuf;
-#endif
 {
    SsMsgInfo *sMinfo;
    SsMsgInfo *dMinfo;
@@ -7635,19 +7191,12 @@ Buffer *dstBuf;
 */
 
 
-#ifdef ANSI
 S16 SMovPartMsg
 (
 Buffer *srcBuf,              /* message 1 */
 MsgLen idx,                 /* index */
 Buffer *dstBuf              /* message 2 */
 )
-#else
-S16 SMovPartMsg(srcBuf, idx, dstBuf)
-Buffer *srcBuf;              /* message 1 */
-MsgLen idx;                 /* index */
-Buffer *dstBuf;             /* message 2 */
-#endif
 {
    MsgLen     dCnt;
    MsgLen     sCnt;
@@ -7762,7 +7311,7 @@ Buffer *dstBuf;             /* message 2 */
             idx -= sCnt;
             /* deallocate the sBuf here */
             tmp = sBuf->b_cont;
-            /* printf("SMovPartMsg() sBuf is completely copied sBuf->b_cont(%p)\n", sBuf->b_cont); */
+            /* printf("\nSMovPartMsg() sBuf is completely copied sBuf->b_cont(%p)\n", sBuf->b_cont); */
             (Void)SPutDBuf(sMinfo->region, sMinfo->pool, sBuf);
             srcBuf->b_cont = sBuf = tmp;
          }
@@ -7809,19 +7358,12 @@ Buffer *dstBuf;             /* message 2 */
 *
 */
  
-#ifdef ANSI
 S16 SPkMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
-#else
-S16 SPkMsgMult(src, cnt, mBuf)
-Data *src;
-MsgLen cnt;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;   /* Message info */
    Buffer *tmp;
@@ -7920,19 +7462,12 @@ Buffer *mBuf;
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetReadPtr
 (
- Buffer *mBuf, 
- uint8_t** data, 
- MsgLen *len
+Buffer *mBuf, 
+uint8_t** data, 
+MsgLen *len
 )
-#else
-S16 SGetReadPtr (mBuf, data, len)
-Buffer *mBuf; 
-uint8_t** data; 
-MsgLen *len;
-#endif 
 {
 /*   Buffer       *tmp; */
 
@@ -7981,7 +7516,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAttachPtrToBuf
 (
 Region   region,
@@ -7990,14 +7524,6 @@ Data    *ptr,
 MsgLen   totalLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachPtrToBuf(region, pool, ptr, totalLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-MsgLen   totalLen;
-Buffer** mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -8052,7 +7578,9 @@ Buffer** mBuf;
 #ifndef SS_DBUF_REFLOCK_DISABLE
    if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0)
    {
-      printf("Falied to destroy lock\n");
+#ifdef ERROR_PRINT
+      printf("\nFalied to destroy lock\n");
+#endif     
    }
 #endif
 
@@ -8083,7 +7611,7 @@ Buffer** mBuf;
 */
 
 #ifdef T2K_MEM_LEAK_DBG
-PRIVATE S16 SPutZbcDBufNew
+static S16 SPutZbcDBufNew
 (
 Region region,
 Buffer *buf,
@@ -8091,17 +7619,11 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
-PRIVATE S16 SPutZbcDBuf
+static S16 SPutZbcDBuf
 (
 Region region,
 Buffer *buf
 )
-#else
-PRIVATE S16 SPutZbcDBuf(region, buf)
-Region region;
-Buffer *buf;
-#endif
 #endif
 {
    register SsDblk *dptr;
@@ -8168,7 +7690,9 @@ Buffer *buf;
          ret = SUnlock(&dptr->dBufLock) ;
          if((SDestroyLock(&dptr->dBufLock)) != 0)
          {
-             printf("Falied to destroy lock\n");
+#ifdef ERROR_PRINT
+             printf("\nFalied to destroy lock\n");
+#endif
          }
 #endif
 #ifdef SS_HISTOGRAM_SUPPORT 
@@ -8228,7 +7752,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAttachPtrToMBuf
 (
 Region   region,
@@ -8238,15 +7761,6 @@ MsgLen   totalLen,
 MsgLen   ptrLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachPtrToMBuf(region, pool, ptr, totalLen, ptrLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-MsgLen   totalLen;
-MsgLen   ptrLen;
-Buffer** mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -8299,7 +7813,9 @@ Buffer** mBuf;
 #ifndef SS_DBUF_REFLOCK_DISABLE
    if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0)
    {
-      printf("Falied to destroy lock\n");
+#ifdef ERROR_PRINT
+      printf("\nFalied to destroy lock\n");
+#endif
    }
 #endif
 
@@ -8310,7 +7826,7 @@ Buffer** mBuf;
    minfo->len    = totalLen;
    minfo->endptr = newblk;
 
-   //printf("Mbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr);
+   //printf("\nMbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr);
    return ROK;
 }
 #endif /* INTEL_WLS */
@@ -8338,7 +7854,7 @@ Void SResetMBuf(Buffer *mbuf)
    if(tmp)
    {
 
-    //    printf("SResetMBuf The write & read ptr is %p %p %p %p \n", tmp->b_wptr, tmp->b_rptr, tmp->b_datap->db_base, tmp->b_datap->db_lim );
+    //    printf("\nSResetMBuf The write & read ptr is %p %p %p %p \n", tmp->b_wptr, tmp->b_rptr, tmp->b_datap->db_base, tmp->b_datap->db_lim );
 //      tmp->b_wptr = tmp->b_rptr = tmp->b_datap->db_base;
       tmp->b_wptr = tmp->b_rptr = (tmp->b_datap->db_base + 5);
       tmp->b_datap->db_ref = 1;
@@ -8384,7 +7900,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAttachWlsPtrToMBuf
 (
 Region   region,
@@ -8395,16 +7910,6 @@ MsgLen   totalLen,
 MsgLen   ptrLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, totalLen, ptrLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-Data    *readPtr;
-MsgLen   totalLen;
-MsgLen   ptrLen;
-Buffer** mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -8457,7 +7962,9 @@ Buffer** mBuf;
 #ifndef SS_DBUF_REFLOCK_DISABLE
    if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0)
    {
-      printf("Falied to destroy lock\n");
+#ifdef ERROR_PRINT
+      printf("\nFalied to destroy lock\n");
+#endif
    }
 #endif
 
@@ -8468,13 +7975,13 @@ Buffer** mBuf;
    minfo->len    = totalLen;
    minfo->endptr = newblk;
 
-   //printf("Mbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr);
+   //printf("\nMbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr);
    return ROK;
 }
 
 #ifdef TENB_DPDK_BUF
 
-extern uint32_t numeTti;
+uint32_t numeTti;
 
 S16 SGetSBufDpdk
 (
@@ -8494,7 +8001,7 @@ S16 SPutSBufDpdk
 Data *ptr                     /* pointer to buffer */
 )
 {
-    S16   ret;
+    S16   ret = ROK;
     uint32_t   flags = 0;
 
     ntl_free(mtGetNtlHdl(), ptr);
@@ -8564,7 +8071,6 @@ S16 SDetachDpdkPtrFrmMBuf
 }
 
 
-#ifdef ANSI
 S16 SAttachDpdkPtrToMBuf
 (
 Region   region,
@@ -8575,16 +8081,6 @@ MsgLen   msgLen,
 MsgLen   totalLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachDpdkPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-Data    *readPtr;
-MsgLen   msgLen;
-MsgLen   totalLen;
-Buffer** mBuf;
-#endif
 {
 
    SsDblk    *dptr;