X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fctf.c;h=e310a8bc25ec4898661eda0eeb643fb7892ae0bf;hb=05d098e6b94f629a932caaff404f2b703b123852;hp=595d6d4951641385da775ef6428db31f4859a629;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/cm/ctf.c b/src/cm/ctf.c
index 595d6d495..e310a8bc2 100755
--- a/src/cm/ctf.c
+++ b/src/cm/ctf.c
@@ -63,22 +63,14 @@
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkCtfBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -127,24 +119,16 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfBndReq
 (
 CtfBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBndReq(func, pst, mBuf)
-CtfBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    SpId spId = 0;
    
-   TRC3(cmUnpkCtfBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -181,26 +165,18 @@ Buffer *mBuf;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
-#else
-S16 cmPkCtfBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -246,28 +222,20 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfBndCfm
 (
 CtfBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBndCfm(func, pst, mBuf)
-CtfBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCtfBndCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -307,22 +275,14 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkCtfUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -371,24 +331,16 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUbndReq
 (
 CtfUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUbndReq(func, pst, mBuf)
-CtfUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    Reason reason = 0;
    
-   TRC3(cmUnpkCtfUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -429,27 +381,21 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmRelCtfCfgReq
+static S16 cmRelCtfCfgReq
 (
 Pst  *pst,
 CtfCfgReqInfo *cfgReqInfo
 )
-#else
-PRIVATE S16 cmRelCtfCfgReq(pst,cfgReqInfo)
-Pst  *pst;
-CtfCfgReqInfo *param;
-#endif
 {
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
    if(cfgReqInfo->vendorParams.paramBuffer != NULLP) {
-      SPutSBuf(pst->region, pst->pool, 
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, 
                    (Data *)cfgReqInfo->vendorParams.paramBuffer,
                    cfgReqInfo->vendorParams.buffLen);
    }
 #endif
-   SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo)); 
+   SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo)); 
    return ROK;
 }
 
@@ -474,22 +420,15 @@ CtfCfgReqInfo *param;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfNhKeyInfo(param, mBuf)
-CtfNhKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
 
-   TRC3(cmPkCtfNhKeyInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -521,22 +460,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfKenbStarInfo(param, mBuf)
-CtfKenbStarInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
 
-   TRC3(cmPkCtfKenbStarInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -569,23 +501,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAskeyInfo(param, mBuf)
-CtfAsKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    S16  idx;
-
-   TRC3(cmPkCtfAskeyInfo)
-
          
    for(idx=31;idx>=0;idx--)
    {
@@ -617,20 +539,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmPkCtfKdfReqInfo(param, mBuf)
-CtfKdfReqInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-   TRC3(cmPkCtfKdfReqInfo)
 
    switch (param->keyDerType)
     {
@@ -666,7 +581,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfKdfReq
 (
 Pst* pst,
@@ -674,19 +588,9 @@ SpId spId,
 CtfCfgTransId transId,
 CtfKdfReqInfo* kdfReqInfo
 )
-#else
-S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfKdfReqInfo* kdfReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-
-   TRC3(cmPkCtfKdfReq)
-   
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -694,7 +598,7 @@ CtfKdfReqInfo* kdfReqInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -705,7 +609,7 @@ CtfKdfReqInfo* kdfReqInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -719,7 +623,7 @@ CtfKdfReqInfo* kdfReqInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -730,12 +634,12 @@ CtfKdfReqInfo* kdfReqInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if (SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) {
+      if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -754,44 +658,31 @@ CtfKdfReqInfo* kdfReqInfo;
 /********************************************************************************************************************************/
                               /*START OF CNM PACK & UNPACK FUNCTIONS*/
 /********************************************************************************************************************************/
-#ifdef ANSI
 S16 cmPkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
-#else
-CtfCnmVendorSpecificInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
-   TRC3(cmPkCtfCnmVendorSpecificInfo);
    if(param->numOfVendorSpecifcParam <= CTF_CNM_MAX_VENDOR_PARAMS)
    {
       for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--)
       {
-         CMCHKPK(oduUnpackUInt32,(U32)param->vendorSpecifcParam[i], mBuf);
+         CMCHKPK(oduUnpackUInt32,(uint32_t)param->vendorSpecifcParam[i], mBuf);
       }
    }
    CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf);
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf)
-CtfCnmCellSyncReq *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCtfCnmCellSyncReq);
    CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
    CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf);
@@ -803,20 +694,13 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfcfgReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgReqInfo(param, mBuf)
-CtfCnmInitSyncReq *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
-   TRC3(cmPkCtfcfgReqInfo);
 
    CMCHKPK(oduUnpackUInt8, param->searchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf);
@@ -833,20 +717,13 @@ Buffer *mBuf;
    return ROK;
 
 }
-#ifdef ANSI
 S16 cmUnpkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf)
-CtfCnmVendorSpecificInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
-   TRC3(cmUnpkCtfCnmVendorSpecificInfo);
 
    CMCHKUNPK(oduPackUInt16, &param->numOfVendorSpecifcParam, mBuf);
    for(i=0; (i<param->numOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++)
@@ -856,20 +733,12 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf)
-CtfCnmCellSyncReq *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkCtfCtfCnmCellSyncReq);
-
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->nbrSpecSfCfg, mBuf);
@@ -882,20 +751,13 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfsyncReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfsyncReqInfo(param, mBuf)
-CtfCnmInitSyncReq *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
-   TRC3(cmUnpkCtfsyncReqInfo);
 
    CMCHKUNPK(oduPackUInt16, &param->numOfPciList, mBuf);
    for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
@@ -924,7 +786,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncReq
 (
 Pst* pst,
@@ -932,19 +793,10 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncReq * cfgReqInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncReq * cfgReqInfo;
-#endif
 {
 
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkCtfCnmCellSyncReq)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -952,7 +804,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -963,7 +815,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -977,7 +829,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF018, (ErrVal)0, "Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -990,7 +842,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -1001,12 +853,12 @@ CtfCnmCellSyncReq * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
    }
    pst->event = (Event)EVTCTFCNMSYNCREQ;
    return (SPstTsk(pst,mBuf));
@@ -1026,25 +878,17 @@ CtfCnmCellSyncReq * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf)
-CtfCnmCellSyncReqMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncReq *SyncReqMsg = NULLP;
-   TRC3(cmUnpkCtfCnmCellSyncReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1067,7 +911,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1086,7 +930,7 @@ Buffer *mBuf;
    }
   else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfCtfCnmCellSyncReq(SyncReqMsg, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)SyncReqMsg, sizeof(CtfCnmCellSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)SyncReqMsg, sizeof(CtfCnmCellSyncReq));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1118,7 +962,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmInitSyncReq
 (
 Pst* pst,
@@ -1126,17 +969,9 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmInitSyncReq * cfgReqInfo
 )
-#else
-S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmInitSyncReq * cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkCtfCnmInitSyncReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1145,7 +980,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -1156,7 +991,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1170,7 +1005,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF018, (ErrVal)0, "Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1183,7 +1018,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -1194,12 +1029,12 @@ CtfCnmInitSyncReq * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
    }
    pst->event = (Event)EVTCTFCNMINITSYNCREQ;
    return (SPstTsk(pst,mBuf));
@@ -1221,25 +1056,17 @@ CtfCnmInitSyncReq * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncReq
 (
 CtfCnmInitSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf)
-CtfCnmInitSyncReqMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmInitSyncReq *syncReqInfo = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1262,7 +1089,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1281,7 +1108,7 @@ Buffer *mBuf;
    }
   else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfsyncReqInfo(syncReqInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)syncReqInfo, sizeof(CtfCnmInitSyncReq));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncReqInfo, sizeof(CtfCnmInitSyncReq));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1296,19 +1123,12 @@ Buffer *mBuf;
 }
 /*-----------------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfctfCnmMibInfo(param, mBuf)
-CtfCnmMibInfo *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkCtfctfCnmMibInfo)
 
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
    CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf);
@@ -1319,19 +1139,12 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf)
-CtfCnmInitSyncInfo *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkCtfctfCnmInitSyncInfo)
 
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
@@ -1343,21 +1156,13 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfcfgRspInfo
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgRspInfo(param, mBuf)
-CtfCnmInitSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
-   TRC3(cmPkCtfcfgRspInfo)
-
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
@@ -1388,7 +1193,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmInitSyncRsp
 (
 Pst* pst,
@@ -1396,16 +1200,8 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmInitSyncRsp * cfgRspInfo
 )
-#else
-S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmInitSyncRsp * cfgRspInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmInitSyncRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1414,7 +1210,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -1425,7 +1221,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1439,7 +1235,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF018, (ErrVal)0, "Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1452,7 +1248,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -1463,12 +1259,12 @@ CtfCnmInitSyncRsp * cfgRspInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
    }
    pst->event = (Event)EVTCTFCNMINITSYNCRSP;
    return (SPstTsk(pst,mBuf));
@@ -1476,20 +1272,12 @@ CtfCnmInitSyncRsp * cfgRspInfo;
 }
 /*-----------------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfctfCnmMibInfo(param, mBuf)
-CtfCnmMibInfo *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkCtfctfCnmMibInfo);
-
 
    CMCHKUNPK(oduPackUInt8, &param->dlSystemBandWidht, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->phichResource, mBuf);
@@ -1500,19 +1288,12 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkctfCnmInitSyncInfo(param, mBuf)
-CtfCnmInitSyncInfo *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkctfCnmInitSyncInfo);
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, &param->ctfCnmMibInfo, mBuf);
@@ -1524,21 +1305,13 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncRspMsg
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf)
-CtfCnmInitSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
     S32 i;
-    TRC3(cmUnpkCtfCnmInitSyncRspMsg);
-
 
     CMCHKUNPK(oduPackUInt8, &param->numOfNeighbourInfo, mBuf);
     for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
@@ -1564,25 +1337,17 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncRsp
 (
 CtfCnmInitSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf)
-CtfCnmInitSyncRspMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmInitSyncRsp *syncRspInfo = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1605,7 +1370,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) {
+      if((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1624,7 +1389,7 @@ Buffer *mBuf;
    }
   else if (pst->selector == ODU_SELECTOR_LC)
       if(cmUnpkCtfCnmInitSyncRspMsg(syncRspInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)syncRspInfo, sizeof(CtfCnmInitSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncRspInfo, sizeof(CtfCnmInitSyncRsp));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1640,21 +1405,13 @@ Buffer *mBuf;
 }
 /*-----------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfCellSyncRsp 
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellSyncRsp(param, mBuf)
-CtfCnmCellSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCellSyncRsp)
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    return ROK;
 
@@ -1674,7 +1431,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncRsp
 (
 Pst* pst,
@@ -1682,17 +1438,9 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncRsp * cfgRspInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncRsp * cfgRspInfo;
-#endif
 {
 
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmCellSyncRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1701,7 +1449,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -1712,7 +1460,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1726,7 +1474,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF018, (ErrVal)0, "Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1739,7 +1487,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -1750,12 +1498,12 @@ CtfCnmCellSyncRsp * cfgRspInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
    }
    pst->event = (Event)EVTCTFCNMSYNCRSP;
    return (SPstTsk(pst,mBuf));
@@ -1764,21 +1512,13 @@ CtfCnmCellSyncRsp * cfgRspInfo;
 }
 /*------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmSyncRspMsg
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf)
-CtfCnmCellSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfCnmSyncRspMsg);
-
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
 
@@ -1797,25 +1537,17 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncRsp
 (
 CtfCnmCellSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf)
-CtfCnmCellSyncRspMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncRsp *syncRspMsg = NULLP;
-   TRC3(cmUnpkCtfCnmCellSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1838,7 +1570,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1857,7 +1589,7 @@ Buffer *mBuf;
    }
   else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfCnmSyncRspMsg(syncRspMsg, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)syncRspMsg, sizeof(CtfCnmCellSyncRsp));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncRspMsg, sizeof(CtfCnmCellSyncRsp));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1873,21 +1605,13 @@ Buffer *mBuf;
 }
 /*---------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfcfgIndInfo
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgIndInfo(param, mBuf)
-CtfCnmCellSyncInd *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfcfgIndInfo);
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    return ROK;
@@ -1908,7 +1632,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncInd
 (
 Pst* pst,
@@ -1916,17 +1639,9 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncInd * cfgIndInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncInd * cfgIndInfo;
-#endif
 {
    
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmCellSyncInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1935,7 +1650,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -1946,7 +1661,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1960,7 +1675,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF018, (ErrVal)0, "Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -1973,7 +1688,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -1984,12 +1699,12 @@ CtfCnmCellSyncInd * cfgIndInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
    }
    pst->event = (Event)EVTCTFCNMSYNCIND;
    return (SPstTsk(pst,mBuf));
@@ -1998,21 +1713,13 @@ CtfCnmCellSyncInd * cfgIndInfo;
 
 /*---------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmSyncIndMsg
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf)
-CtfCnmCellSyncInd *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfCnmSyncIndMsg);
-
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
@@ -2032,25 +1739,17 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncInd
 (
 CtfCnmCellSyncIndMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf)
-CtfCnmCellSyncIndMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncInd *syncIndMsg = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2073,7 +1772,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2092,7 +1791,7 @@ Buffer *mBuf;
    }
   else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfCnmSyncIndMsg(syncIndMsg, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)syncIndMsg, sizeof(CtfCnmCellSyncInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncIndMsg, sizeof(CtfCnmCellSyncInd));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2129,7 +1828,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCfgReq
 (
 Pst* pst,
@@ -2137,16 +1835,8 @@ SpId spId,
 CtfCfgTransId transId,
 CtfCfgReqInfo* cfgReqInfo
 )
-#else
-S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfCfgReqInfo* cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCfgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2232,23 +1922,15 @@ CtfCfgReqInfo* cfgReqInfo;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfNhKeyInfo(param, mBuf)
-CtfNhKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
-
-   TRC3(cmUnpkCtfNhKeyInfo)
-         
+   uint8_t  idx;
+        
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2276,23 +1958,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKenbStarInfo(param, mBuf)
-CtfKenbStarInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfKenbStarInfo)
-         
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2321,22 +1995,13 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAskeyInfo(param, mBuf)
-CtfAskeyInfo *param;
-Buffer *mBuf;
-#endif
 {
-
-   U8  idx;
-
-   TRC3(cmUnpkCtfAskeyInfo)
+   uint8_t  idx;
 
    CMCHKUNPK(oduPackUInt8, &param->intgAlgoType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ciphAlgoType, mBuf);
@@ -2365,21 +2030,13 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmUnpkCtfKdfReqInfo(param, mBuf)
-CtfKdfReqInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-   TRC3(cmUnpkCtfKdfReqInfo)
-
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
      switch (param->keyDerType)
     {
@@ -2413,25 +2070,17 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfKdfReq
 (
 CtfKdfReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKdfReq(func, pst, mBuf)
-CtfKdfReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfKdfReqInfo *kdfReqInfo = NULLP;
    
-   TRC3(cmUnpkCtfKdfReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2456,7 +2105,7 @@ Buffer *mBuf;
    }
    
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&kdfReqInfo, sizeof(CtfKdfReqInfo))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&kdfReqInfo, sizeof(CtfKdfReqInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2477,7 +2126,7 @@ Buffer *mBuf;
    }
    else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
       SPutMsg(mBuf);
 	  #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2509,25 +2158,17 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCfgReq
 (
 CtfCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgReq(func, pst, mBuf)
-CtfCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCfgReqInfo *cfgReqInfo = NULLP;
    
-   TRC3(cmUnpkCtfCfgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2550,7 +2191,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2602,22 +2243,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfNhKeyCfmInfo(param, mBuf)
-CtfNhKeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
-
-   TRC3(cmPkCtfNhKeyCfmInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2644,22 +2277,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfKenbStarCfmInfo(param, mBuf)
-CtfKenbStarCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
 
-   TRC3(cmPkCtfKenbStarCfmInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2687,23 +2313,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAskeyCfmInfo(param, mBuf)
-CtfAskeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
 
-   TRC3(cmPkCtfCtfAskeyCfmInfo)
-
    for(idx=15;idx>=0;idx--)
    {
       CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf);
@@ -2737,23 +2355,15 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmPkCtfKdfCfmInfo(param, mBuf)
-CtfKdfCfmInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-   TRC3(cmPkCtfKdfCfmInfo)
-
    switch (param->keyDerType)
-    {
+   {
          case CTF_KDF_TYPE1:
              CMCHKPK(cmPkCtfAskeyCfmInfo, &param->u.kEnbInf, mBuf);
              break;
@@ -2780,29 +2390,20 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfKdfCfm
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId,
 CtfKdfCfmInfo *kdfCfmInfo,
-U8 status
+uint8_t status
 )
-#else
-S16 cmPkCtfKdfCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfKdfCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2811,7 +2412,7 @@ U8 status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
       return RFAILED;
    }
 
@@ -2822,7 +2423,7 @@ U8 status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF027, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -2834,7 +2435,7 @@ U8 status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -2846,7 +2447,7 @@ U8 status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -2858,12 +2459,12 @@ U8 status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   if (SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK) 
+   if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK) 
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
    /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2890,28 +2491,19 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCfgCfm
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId,
-U8 status
+uint8_t status
 )
-#else
-S16 cmPkCtfCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCfgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2969,22 +2561,14 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfEnbStopInd
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId
 )
-#else
-S16 cmPkCtfEnbStopInd(pst, suId, transId)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfEnbStopInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3038,23 +2622,15 @@ CtfCfgTransId transId;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf)
-CtfNhKeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfNhKeyCfmInfo)
-         
    for(idx=0;idx<32;idx++)
    {
       CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
@@ -3080,22 +2656,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf)
-CtfKenbStarCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
-
-   TRC3(cmUnpkCtfKenbStarCfmInfo)
+   uint8_t  idx;
          
    for(idx=0;idx<32;idx++)
    {
@@ -3123,22 +2691,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAskeyCfmInfo(param, mBuf)
-CtfAskeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfCtfAskeyCfmInfo)
          
    for(idx=0;idx<16;idx++)
    {
@@ -3173,20 +2734,13 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmUnpkCtfKdfCfmInfo(param, mBuf)
-CtfKdfCfmInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-   TRC3(cmUnpkCtfKdfCfmInfo)
 
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
    switch (param->keyDerType)
@@ -3216,30 +2770,22 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfKdfCfm
 (
 CtfKdfCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
-CtfKdfCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   U8 status;
+   uint8_t status;
    CtfKdfCfmInfo kdfCfmInfo;
    
-   TRC3(cmUnpkCtfKdfCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3298,29 +2844,21 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCfgCfm
 (
 CtfCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
-CtfCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCtfCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3369,24 +2907,15 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfEnbStopInd
 (
 CtfEnbStopInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfEnbStopInd(func, pst, mBuf)
-CtfEnbStopInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   
-   TRC3(cmUnpkCtfCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3428,7 +2957,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUeIdChgReq
 (
 Pst* pst,
@@ -3437,17 +2965,8 @@ CtfCfgTransId transId,
 CtfUeInfo * ueInfo,
 CtfUeInfo * newUeInfo
 )
-#else
-S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfUeInfo * ueInfo;
-CtfUeInfo * newUeInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUeIdChgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3456,8 +2975,8 @@ CtfUeInfo * newUeInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF033, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-      SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
       return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
@@ -3468,8 +2987,8 @@ CtfUeInfo * newUeInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF034, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-         SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -3482,8 +3001,8 @@ CtfUeInfo * newUeInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF035, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-         SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -3496,8 +3015,8 @@ CtfUeInfo * newUeInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF036, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-         SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -3510,8 +3029,8 @@ CtfUeInfo * newUeInfo;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF037, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-         SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -3523,8 +3042,8 @@ CtfUeInfo * newUeInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF038, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-      SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -3535,13 +3054,13 @@ CtfUeInfo * newUeInfo;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF039, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-      SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
+      if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3551,7 +3070,7 @@ CtfUeInfo * newUeInfo;
          SPutMsg(mBuf);
          return RFAILED;
       }
-      if (SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) {
+      if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3582,26 +3101,18 @@ CtfUeInfo * newUeInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUeIdChgReq
 (
 CtfUeIdChgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf)
-CtfUeIdChgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfUeInfo *ueInfo = NULLP;
    CtfUeInfo *newUeInfo = NULLP;
    
-   TRC3(cmUnpkCtfUeIdChgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3624,7 +3135,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3643,7 +3154,7 @@ Buffer *mBuf;
    }
    else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3654,7 +3165,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3662,7 +3173,7 @@ Buffer *mBuf;
             (ErrVal)ECTF046, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
          SPutMsg(mBuf);
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
          return RFAILED;
       }
    }
@@ -3674,8 +3185,8 @@ Buffer *mBuf;
    }
    else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfUeInfo(newUeInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
-      SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3701,11 +3212,10 @@ Buffer *mBuf;
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
 *  @param[in]   CtfUeInfo *  ueInfo
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUeIdChgCfm
 (
 Pst* pst,
@@ -3714,17 +3224,8 @@ CtfCfgTransId transId,
 CtfUeInfo * ueInfo,
 CmStatus status
 )
-#else
-S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-CtfUeInfo * ueInfo;
-CmStatus status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUeIdChgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3733,7 +3234,7 @@ CmStatus status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF048, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       return RFAILED;
    }
    if (cmPkCmStatus(&status, mBuf) != ROK) {
@@ -3743,7 +3244,7 @@ CmStatus status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF049, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -3755,7 +3256,7 @@ CmStatus status;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF050, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -3768,7 +3269,7 @@ CmStatus status;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF051, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
          SPutMsg(mBuf);
          return RFAILED;
       }
@@ -3780,7 +3281,7 @@ CmStatus status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF052, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -3791,12 +3292,12 @@ CmStatus status;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF053, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
+      if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3823,30 +3324,22 @@ CmStatus status;
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
 *  @param[in]   CtfUeInfo *  ueInfo
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUeIdChgCfm
 (
 CtfUeIdChgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf)
-CtfUeIdChgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
    CtfUeInfo *ueInfo = NULLP;
    CmStatus status;
    
-   TRC3(cmUnpkCtfUeIdChgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3869,7 +3362,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3888,7 +3381,7 @@ Buffer *mBuf;
    }
    else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3899,7 +3392,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (cmUnpkCmStatus(&status, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3929,22 +3422,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgTransId(param, mBuf)
-CtfCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-   TRC3(cmPkCtfCfgTransId)
-
    for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
       CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
    }
@@ -3968,21 +3453,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgTransId(param, mBuf)
-CtfCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-   TRC3(cmUnpkCtfCfgTransId)
 
    for (i=0; i<CTF_CFG_TRANSID_SIZE; i++) {
       CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
@@ -4007,21 +3485,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeInfo(param, mBuf)
-CtfUeInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfUeInfo)
-
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
@@ -4044,21 +3514,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeInfo(param, mBuf)
-CtfUeInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfUeInfo)
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    return ROK;
@@ -4083,20 +3545,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfBwCfgInfo(param, mBuf)
-CtfBwCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfBwCfgInfo)
 
    CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf);
    CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf);
@@ -4124,26 +3579,19 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBwCfgInfo(param, mBuf)
-CtfBwCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U32 tmpEnum;
-   TRC3(cmUnpkCtfBwCfgInfo)
+   uint32_t tmpEnum;
 
    /* ctf_c_001.main_4: Removed UnPacking of param->pres */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->dlBw = (CtfBandwidth)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ulBw = (CtfBandwidth)tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->eUtraBand, mBuf);
    return ROK;
@@ -4167,21 +3615,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfTxSchemeCfg(param, mBuf)
-CtfTxSchemeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfTxSchemeCfg)
-
    CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
    CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
    CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf);
@@ -4207,28 +3647,21 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfTxSchemeCfg(param, mBuf)
-CtfTxSchemeCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfTxSchemeCfg)
 
    /* ctf_c_001.main_4: Removed UnPacking of param->pres */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->duplexMode = (CtfDuplexMode)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->scSpacing = (CtfSCSpacing)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->cycPfx = (CtfCPCfg)tmpEnum;
    return ROK;
 }
@@ -4252,21 +3685,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAntennaCfgInfo(param, mBuf)
-CtfAntennaCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfAntennaCfgInfo)
-
    CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
    return ROK;
 }
@@ -4290,22 +3715,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAntennaCfgInfo(param, mBuf)
-CtfAntennaCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfAntennaCfgInfo)
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum;
    return ROK;
 }
@@ -4335,21 +3753,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPrachCfgInfo(param, mBuf)
-CtfPrachCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPrachCfgInfo)
-
    /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4388,21 +3798,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPrachCfgInfo(param, mBuf)
-CtfPrachCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfPrachCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4435,20 +3837,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPdschCfgInfo(param, mBuf)
-CtfPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPdschCfgInfo)
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4478,21 +3873,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPdschCfgInfo(param, mBuf)
-CtfPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfPdschCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4522,21 +3909,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschCfgBasic(param, mBuf)
-CtfPuschCfgBasic *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPuschCfgBasic)
-
    CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
    CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
    CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf);
@@ -4563,24 +3942,16 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschCfgBasic(param, mBuf)
-CtfPuschCfgBasic *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
-   TRC3(cmUnpkCtfPuschCfgBasic)
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->noOfsubBands, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->hoppingMode = (CtfPuschHoppingMode)tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->hoppingOffset, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->enable64QAM, mBuf);
@@ -4606,21 +3977,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschUlRS(param, mBuf)
-CtfPuschUlRS *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPuschUlRS)
-
    CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
    CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
    CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf);
@@ -4647,20 +4010,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschUlRS(param, mBuf)
-CtfPuschUlRS *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfPuschUlRS)
 
    CMCHKUNPK(oduPackUInt8, &param->grpHopEnabled, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->seqHopEnabled, mBuf);
@@ -4688,21 +4044,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschCfgInfo(param, mBuf)
-CtfPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPuschCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4732,21 +4080,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschCfgInfo(param, mBuf)
-CtfPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfPuschCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4776,21 +4116,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPhichCfgInfo(param, mBuf)
-CtfPhichCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPhichCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4820,29 +4152,21 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPhichCfgInfo(param, mBuf)
-CtfPhichCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
-   TRC3(cmUnpkCtfPhichCfgInfo)
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-     CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->duration = (CtfPhichDuration)tmpEnum;
-     CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->resource = (CtfPhichResource)tmpEnum;
    }
    return ROK;
@@ -4867,20 +4191,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPucchCfgInfo(param, mBuf)
-CtfPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfPucchCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4913,21 +4230,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPucchCfgInfo(param, mBuf)
-CtfPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
-   TRC3(cmUnpkCtfPucchCfgInfo)
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4936,7 +4245,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8, &param->nRB, mBuf);
       CMCHKUNPK(oduPackUInt8, &param->nCS, mBuf);
       CMCHKUNPK(oduPackUInt16, &param->n1PUCCH, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->deltaShift = (CtfPucchDeltaShift)tmpEnum;
    }
    return ROK;
@@ -4961,21 +4270,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfSrsUlCfgInfo(param, mBuf)
-CtfSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfSrsUlCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5008,21 +4309,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf)
-CtfSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfSrsUlCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5055,21 +4348,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfTddSfCfgInfo(param, mBuf)
-CtfTddSfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfTddSfCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5099,20 +4384,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfVendorSpecParams
 (
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfVendorSpecParams(param, mBuf)
-CtfVendorSpecific *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfVendorSpecParams)
    if( param->buffLen != 0) {
      SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf);   
    }
@@ -5138,27 +4416,18 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfVendorSpecParams
 (
 Pst *pst,
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf)
-Pst *pst;
-CtfVendorSpecific *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfVendorSpecParams)
-
    CMCHKUNPK(oduPackUInt16, &param->buffLen, mBuf);
 
    if(param->buffLen != 0) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&param->paramBuffer, param->buffLen)) != ROK) {
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&param->paramBuffer, param->buffLen)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
                (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -5193,21 +4462,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfTddSfCfgInfo(param, mBuf)
-CtfTddSfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfTddSfCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5232,21 +4493,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkCtfUnLicnsdCellParam
+static S16 cmPkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkCtfUnLicnsdCellParam(param, mBuf)
-CtfUnLicnsdCfgInfo  *param;
-Buffer *mBuf;
-#endif
 {
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmPkCtfUnLicnsdCellParam)
 
    CMCHKPK(SPkS32, param->txPowerLimit, mBuf);
    CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf);
@@ -5286,22 +4540,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellCfgInfo(param, mBuf)
-CtfCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef EMTC_ENABLE
    S32 i;
 #endif
-   TRC3(cmPkCtfCellCfgInfo)
 
 #ifdef EMTC_ENABLE
    for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) {
@@ -5314,7 +4561,7 @@ Buffer *mBuf;
 #endif
    if(param->unLicnsdCfgPres)
    {   
-      printf("pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres);
+      DU_LOG("\nDEBUG  -->  pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres);
       CMCHKPK(cmPkCtfUnLicnsdCellParam, &param->lteUCfg, mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf);
@@ -5411,21 +4658,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkCtfUnLicnsdCellParam
+static S16 cmUnpkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf)
-CtfUnLicnsdCfgInfo  *param;
-Buffer *mBuf;
-#endif
 {
-   U8  idx;
-
-   TRC3(cmPkCtfUnLicnsdCellParam)
+   uint8_t  idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numFreq, mBuf);
 
@@ -5466,22 +4705,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellCfgInfo(param, mBuf)
-CtfCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef EMTC_ENABLE
    S32 i;
 #endif
-   TRC3(cmUnpkCtfCellCfgInfo)
 
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -5563,7 +4795,7 @@ Buffer *mBuf;
 
    if(param->unLicnsdCfgPres)
    {
-      printf("pverma param->unLicnsdCfgPres 2 -->%d \n",param->unLicnsdCfgPres);
+      DU_LOG("\nDEBUG  -->  pverma param->unLicnsdCfgPres 2 -->%d \n",param->unLicnsdCfgPres);
       CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, &param->lteUCfg, mBuf);
    }   
 #ifdef EMTC_ENABLE
@@ -5600,20 +4832,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellRecfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCellRecfgInfo)
 
 #ifdef ENABLE_API_LOG
    CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf);
@@ -5707,24 +4932,17 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellRecfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U32 tmpEnum;
-   TRC3(cmUnpkCtfCellRecfgInfo)
+   uint32_t tmpEnum;
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ctfReCfgType = (CtfReCfgType)tmpEnum;
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->cellIdGrpId, mBuf);   
@@ -5791,7 +5009,7 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
-   printf("param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); 
+   DU_LOG("\nDEBUG  -->  param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); 
 #ifdef ENABLE_API_LOG
    CMCHKUNPK(oduPackUInt8, &param->enableAPILog, mBuf);
 #endif /* ENABLE_API_LOG */
@@ -5817,21 +5035,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPdschCfgInfo(param, mBuf)
-CtfDedPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedPdschCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
       CMCHKPK(oduUnpackUInt32, param->pA, mBuf);
@@ -5858,26 +5068,19 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf)
-CtfDedPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-   TRC3(cmUnpkCtfDedPdschCfgInfo)
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->pA = (CtfPdschPaParam)tmpEnum;
    }
    return ROK;
@@ -5902,20 +5105,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPucchCfgInfo(param, mBuf)
-CtfDedPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedPucchCfgInfo)
 
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
@@ -5966,20 +5162,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf)
-CtfDedPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedPucchCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -5992,10 +5181,10 @@ Buffer *mBuf;
  
        if (param->pucchSetup.repFactPres)
        {
-          CMCHKUNPK(oduPackUInt32, (U32 *)&param->pucchSetup.repFact, mBuf);
+          CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
        }
 #else
-        CMCHKUNPK(oduPackUInt32, (U32 *)&param->pucchSetup.repFact, mBuf);
+        CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
 #endif /*CTF_VER3 */
       CMCHKUNPK(oduPackUInt16, &param->pucchSetup.n1PUCCHRep, mBuf);
 #ifdef CTF_VER3
@@ -6004,7 +5193,7 @@ Buffer *mBuf;
 
       if (param->tddAckNackCfgPres != FALSE)
       {
-         CMCHKUNPK(oduPackUInt32, (U32 *)&param->tddAckNackFBMode, mBuf);
+         CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->tddAckNackFBMode, mBuf);
       }
 #endif /* CTF_VER3 */
    }
@@ -6030,21 +5219,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPuschCfgInfo(param, mBuf)
-CtfDedPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedPuschCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6075,21 +5256,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf)
-CtfDedPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedPuschCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6121,23 +5294,16 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCqiRptModePeriodic(param, mBuf)
-CtfCqiRptModePeriodic *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCqiRptModePeriodic)
 /* ctf_c_001.main_2: added packning for cqiMask*/
 #ifdef CTF_VER1
-      CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
+      CMCHKPK(oduUnpackUInt32, (uint32_t )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
       CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf);
 #endif /* CTF_VER1 */
       CMCHKPK(oduUnpackUInt8, param->cqiSetup.simultaneousAckNack, mBuf);
@@ -6170,22 +5336,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf)
-CtfCqiRptModePeriodic *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef CTF_VER1    
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 #endif   
-   TRC3(cmUnpkCtfCqiRptModePeriodic)
 
    CMCHKUNPK(oduPackUInt8, &param->cqiPeriodicCfgType, mBuf);
       CMCHKUNPK(oduPackUInt16, &param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
@@ -6198,7 +5357,7 @@ Buffer *mBuf;
 /* ctf_c_001.main_2: added Unpackning for cqiMask*/
 #ifdef CTF_VER1
       CMCHKUNPK(oduPackUInt8, &param->cqiSetup.cqiMask.pres, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum;
 #endif /* CTF_VER1 */
    return ROK;
@@ -6223,21 +5382,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCqiReportCfgInfo(param, mBuf)
-CtfCqiReportCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCqiReportCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6303,22 +5454,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf)
-CtfCqiReportCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #if defined (CTF_VER1) || defined (CTF_VER2)
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 #endif
-   TRC3(cmUnpkCtfCqiReportCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6327,7 +5471,7 @@ Buffer *mBuf;
 /* ctf_c_001.main_2: added Unpackning for cqiMask*/
 #ifdef CTF_VER1
       CMCHKUNPK(oduPackUInt8, &param->pmiRiRpt.pres, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->pmiRiRpt.pmiRiRptSetup = tmpEnum;
 #endif /* CTF_VER1 */
 
@@ -6345,7 +5489,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8, &param->reportMode.aPeriodicRpt.pres, mBuf)
       if(param->reportMode.aPeriodicRpt.pres != FALSE)
       {
-	 CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+	 CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
          param->reportMode.aPeriodicRpt.aPeriodicRptMode =
             (CtfCqiRptModeAperiodic)tmpEnum;
       }
@@ -6355,7 +5499,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8, &param->reportingMode, mBuf);
       switch(param->reportingMode) {
          case CTF_CQI_RPTMODE_APRDIOC:
-            CMCHKUNPK(oduPackUInt32, (U32 *)&param->reportMode.aPeriodicRpt, mBuf);
+            CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->reportMode.aPeriodicRpt, mBuf);
             break;
          case CTF_CQI_RPTMODE_PRDIOC:
             CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, &param->reportMode.periodicRpt, mBuf);
@@ -6387,21 +5531,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf)
-CtfDedSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedSrsUlCfgInfo)
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6437,21 +5573,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf)
-CtfDedSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedSrsUlCfgInfo)
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6487,21 +5615,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedSRCfgInfo(param, mBuf)
-CtfDedSRCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedSRCfgInfo)
-
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
   {
@@ -6532,20 +5652,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedSRCfgInfo(param, mBuf)
-CtfDedSRCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedSRCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6578,24 +5691,17 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedAntCfgInfo(param, mBuf)
-CtfDedAntCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    
 #ifdef CTF_VER2
-   U8  idx;
+   uint8_t  idx;
 #endif  /* CTF_VER2 */
 
-   TRC3(cmPkCtfDedAntCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6603,7 +5709,7 @@ Buffer *mBuf;
       CMCHKPK(oduUnpackUInt32, param->ueTxAntSelection.txAntSelect, mBuf);
       CMCHKPK(oduUnpackUInt8, param->ueTxAntSelection.cfgType, mBuf);
      /* ctf_c_001.main_3 txMode is of type enum and is 32bit length */
-      CMCHKPK(oduUnpackUInt32, (U32)param->txMode, mBuf);
+      CMCHKPK(oduUnpackUInt32, (uint32_t)param->txMode, mBuf);
 #ifdef CTF_VER2
       /* 
        *ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter
@@ -6680,25 +5786,18 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedAntCfgInfo(param, mBuf)
-CtfDedAntCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef CTF_VER2
    S16  idx;
 #endif /* CTF_VER2 */
    
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfDedAntCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6708,7 +5807,7 @@ Buffer *mBuf;
       /* 
        * Added Unpacking for CodeBookSubsetRestriction parameter
        */
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum;
       switch(param->codeBookSubsetRes.ctfCdBkRestType)
       {
@@ -6759,10 +5858,10 @@ Buffer *mBuf;
       }
 #endif /* CTF_VER2 */
       /* ctf_c_001.main_3 Enum is 32bit length */
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->txMode = (CtfUeTxAntMode)tmpEnum;
       CMCHKUNPK(oduPackUInt8, &param->ueTxAntSelection.cfgType, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum;
    }
    return ROK;
@@ -6785,17 +5884,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf)
-CtfUeSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
@@ -6818,23 +5911,17 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfSecCellCfgInfo(*param, mBuf)
-CtfSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
 
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[(U8)idx], mBuf);
+      CMCHKPK(cmPkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[(uint8_t)idx], mBuf);
    }
    CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf);
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
@@ -6858,17 +5945,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf)
-CtfUeSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
@@ -6893,22 +5974,16 @@ Buffer *mBuf;
 *
 **********************************************************/
 
-#ifdef ANSI
 S16 cmUnpkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfSecCellCfgInfo(*param, mBuf)
-CtfSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->sCellAction, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->sCellAction, mBuf);
    for(idx = 0 ; idx < param->numSCells; idx++)
    {
       CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[idx], mBuf);
@@ -6935,20 +6010,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeCatCfgInfo(param, mBuf)
-CtfUeCatCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfUeCatCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6976,25 +6044,18 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeCatCfgInfo(param, mBuf)
-CtfUeCatCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfUeCatCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
-      CMCHKUNPK(oduPackUInt32, (U32 *)&param->ueCategory, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ueCategory, mBuf);
    return ROK;
 }
 
@@ -7017,20 +6078,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedCfgInfo(param, mBuf)
-CtfDedCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedCfgInfo)
 #ifdef EMTC_ENABLE
    CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf);
 #endif
@@ -7068,21 +6122,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedCfgInfo(param, mBuf)
-CtfDedCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedCfgInfo)
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkCtfUeCatCfgInfo, &param->ueCatCfg, mBuf);
@@ -7120,21 +6166,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedRecfgInfo(param, mBuf)
-CtfDedRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedRecfgInfo)
-
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    /*ctf_c_001.main_1*/
    CMCHKPK(cmPkCtfDedAntCfgInfo, &param->antInfo, mBuf);
@@ -7177,21 +6215,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedRecfgInfo(param, mBuf)
-CtfDedRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedRecfgInfo)
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    /* ctf_c_001.main_4: ReEst Fix */
@@ -7236,21 +6266,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellReleaseInfo(param, mBuf)
-CtfCellReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCellReleaseInfo)
-
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -7274,21 +6296,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellReleaseInfo(param, mBuf)
-CtfCellReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfCellReleaseInfo)
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
 }
@@ -7312,20 +6326,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedReleaseInfo(param, mBuf)
-CtfDedReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfDedReleaseInfo)
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -7351,21 +6358,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedReleaseInfo(param, mBuf)
-CtfDedReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfDedReleaseInfo)
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
@@ -7391,21 +6390,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgInfo(param, mBuf)
-CtfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCfgInfo)
-
       switch(param->cfgElem) {
          case CTF_UE_CFG:
             CMCHKPK(cmPkCtfDedCfgInfo, &param->u.dedCfg, mBuf);
@@ -7439,20 +6430,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgInfo(param, mBuf)
-CtfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7487,20 +6471,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfReCfgInfo(param, mBuf)
-CtfReCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfReCfgInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7544,20 +6521,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfReCfgInfo(param, mBuf)
-CtfReCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfReCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7600,20 +6570,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfReleaseInfo(param, mBuf)
-CtfReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfReleaseInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7648,20 +6611,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfReleaseInfo(param, mBuf)
-CtfReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCtfReleaseInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7699,21 +6655,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgReqInfo
 (
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgReqInfo(param, mBuf)
-CtfCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCfgReqInfo)
-
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
    CMCHKPK(cmPkCtfVendorSpecParams, &param->vendorParams, mBuf);
@@ -7759,26 +6707,18 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgReqInfo
 (
 Pst  *pst,
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgReqInfo(param, mBuf)
-Pst  *pst;
-CtfCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef CTF_VER3
    S16 retVal;
 #endif
 
-   TRC3(cmUnpkCtfCfgReqInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
@@ -7819,23 +6759,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellPwrcfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCellPwrcfgInfo)
-
    /* Added the pack for newly added reference signal Power*/
-   CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
@@ -7864,20 +6796,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-
-   TRC3(cmUnpkCtfCellPwrcfgInfo)
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -7886,7 +6810,7 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->ctfCellStatus, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
 
    return ROK;
 }
@@ -7908,23 +6832,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellStop(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCtfCellStop)
-
    /* Added the pack for newly added reference signal Power*/
-   CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
@@ -7951,20 +6867,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellStop(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-
-   TRC3(cmUnpkCtfCellStop)
    
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
@@ -7972,7 +6880,7 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->ctfCellStatus, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
 
    return ROK;
 }
@@ -7994,19 +6902,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkPerRemScanCellInfo(param, mBuf)
-CtfPeriodicRemCellInfo *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkPerRemScanCellInfo)
 
    CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
@@ -8032,20 +6933,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPeriodicCellSearchRsp
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf)
-CtfPeriodicRemCellSearchRsp *param;
-Buffer *mBuf;
-#endif
 {
    S16 idx;
-   TRC3(cmPkCtfPeriodicCellSearchRsp)
 
    for(idx = param->numCells - 1; idx >=0; idx--)
    {
@@ -8071,7 +6965,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfPeriodicRemCellSearchRsp
 (
 Pst* pst,
@@ -8079,16 +6972,8 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfPeriodicRemCellSearchRsp *CellCfgRsp
 )
-#else
-S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfPeriodicRemCellSearchRsp *CellCfgRsp;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfPeriodicRemCellSearchRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -8097,7 +6982,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
          (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));
       return RFAILED;
    }
@@ -8109,7 +6994,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
             (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp,
                sizeof(CtfPeriodicRemCellSearchRsp));
          SPutMsg(mBuf);
          return RFAILED;
@@ -8124,7 +7009,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ECTF018, (ErrVal)0, "Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp,
                sizeof(CtfPeriodicRemCellSearchRsp));
          SPutMsg(mBuf);
          return RFAILED;
@@ -8138,7 +7023,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));
       SPutMsg(mBuf);
       return RFAILED;
@@ -8150,32 +7035,25 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECTF020, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));
       SPutMsg(mBuf);
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));
    }
    pst->event = (Event)EVTCTFPREMCELLSRCHRSP;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf)
-CtfPeriodicRemCellInfo *param;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkCtfPerRemScanCellInfo);
 
    CMCHKUNPK(oduPackUInt8, &param->numTx, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->dlBw, mBuf);
@@ -8184,20 +7062,13 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfPerRemCellSrch
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPerRemCellSrch(param, mBuf)
-CtfPeriodicRemCellSearchRsp *param;
-Buffer *mBuf;
-#endif
 {
    S16 idx;
-   TRC3(cmUnpkCtfPerRemCellSrch);
 
    CMCHKUNPK(oduPackUInt8, &param->numCells, mBuf);
    for(idx = 0; idx < (param->numCells); idx++)
@@ -8221,24 +7092,16 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkPerRemCellSrchRsp
 (
 CtfPerRemCellSrchRsp func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf)
-CtfPerRemCellSrchRsp func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
    CtfPeriodicRemCellSearchRsp *CellSrchRsp = NULLP;  
-   TRC3(cmUnpkPerRemCellSrchRsp)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -8261,7 +7124,7 @@ Buffer *mBuf;
       return RFAILED;
    }
    if (pst->selector != ODU_SELECTOR_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&CellSrchRsp,
+      if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&CellSrchRsp,
                   sizeof(CtfPeriodicRemCellSearchRsp))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -8281,7 +7144,7 @@ Buffer *mBuf;
    }
   else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfPerRemCellSrch(CellSrchRsp, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)CellSrchRsp,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellSrchRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)