X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_mem.c;h=bd0655a59c215b069c6d9378a7771054a3875649;hb=42f73fef5ef8722af83284e0f146b2da693a1f68;hp=cfb865c491e4559c0e186da5b192a2e6c87da005;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c
index cfb865c49..bd0655a59 100755
--- a/src/cm/cm_mem.c
+++ b/src/cm/cm_mem.c
@@ -135,19 +135,19 @@ The following functions are provided in this file.
 #endif
 
 #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */
-PUBLIC U32 memFreeCount=0;
-PUBLIC U32 cmFreeCaller[4]={0};
-PUBLIC U32 cmAllocCaller[4]={0};
-PUBLIC Data *startPtr256=NULLP;
-PUBLIC Data *startPtr128=NULLP;
-PUBLIC U32 cmMemInfo128[100000][2]={0, 0};
-PUBLIC U32 cmMemInfo256[100000][2]={0, 0};
-PUBLIC Data *startPtr512=NULLP;
-PUBLIC Data *startPtr768=NULLP;
-PUBLIC Data *startPtr1664=NULLP;
-PUBLIC Data *startPtr4800=NULLP;
-PUBLIC Data *startPtr9920=NULLP;
-PUBLIC Size regMemSize=0;
+U32 memFreeCount=0;
+U32 cmFreeCaller[4]={0};
+U32 cmAllocCaller[4]={0};
+Data *startPtr256=NULLP;
+Data *startPtr128=NULLP;
+U32 cmMemInfo128[100000][2]={0, 0};
+U32 cmMemInfo256[100000][2]={0, 0};
+Data *startPtr512=NULLP;
+Data *startPtr768=NULLP;
+Data *startPtr1664=NULLP;
+Data *startPtr4800=NULLP;
+Data *startPtr9920=NULLP;
+Size regMemSize=0;
 #endif
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
 //extern CmMmRegCb *mtCMMRegCb[SS_MAX_REGS];
@@ -332,7 +332,7 @@ void RemoveFromT2kMemLeakInfo(U64 address, char *file, U32 line,Region region)
 
    /* if(!startMemLeak)
    {
-      RETVALUE(ROK);
+      return ROK;
    }*/
 
    U32 index1 = getT2kMemLeakIndex(address, region);
@@ -462,14 +462,14 @@ U32 cmDblFreeAttempts = 0;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmMmRegInit
+S16 cmMmRegInit
 (
 Region       region,
 CmMmRegCb   *regCb,
 CmMmRegCfg  *cfg
 )
 #else
-PUBLIC S16 cmMmRegInit(region, regCb, cfg)
+S16 cmMmRegInit(region, regCb, cfg)
 Region       region;
 CmMmRegCb   *regCb;
 CmMmRegCfg  *cfg;
@@ -489,21 +489,20 @@ CmMmRegCfg  *cfg;
    CmMmBlkHdr     ptrHdr;
 #endif
 
-   TRC2(cmMmRegInit);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
 
    /* error check on parameters */
    if ((regCb == NULLP) || (cfg == NULLP)) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    /* Error check on the configuration fields */
    if ((!cfg->size) || (cfg->vAddr == NULLP) || 
         (cfg->numBkts > CMM_MAX_BKT_ENT)) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Check if the quantum size is power of 2 */
    if ((cfg->numBkts) &&
@@ -512,7 +511,7 @@ CmMmRegCfg  *cfg;
       /* cm_mem_c_001.main_20 Addition */
 		sprintf(errMsg,"\n cmMmRegInit() failed, check if BktQuantum size might not be power of 2 \n");
 		SPrint(errMsg);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* 
@@ -538,7 +537,7 @@ CmMmRegCfg  *cfg;
 			 				\n",bktIdx,cfg->bktCfg[bktIdx].size,cfg->bktQnSize);
 #endif                     
 			 SPrint(errMsg);
-          RETVALUE(RFAILED);
+          return RFAILED;
       }
 
       if ((bktBlkSize = cfg->bktCfg[bktIdx].size) < lstQnSize)
@@ -549,7 +548,7 @@ CmMmRegCfg  *cfg;
           /* cm_mem_c_001.main_20 Addition */
 			 sprintf(errMsg,"\n cmMmRegInit() failed, Two consecutive buckets are not separated by quantum size \n");
 			 SPrint(errMsg);
-          RETVALUE(RFAILED);
+          return RFAILED;
       }
       /* cm_mem_c_001.main_20 Addition */
 		if (((cfg->bktCfg[bktIdx].size) /\
@@ -565,7 +564,7 @@ CmMmRegCfg  *cfg;
 				\n	should be less than CMM_MAX_MAP_ENT:%d \n",cfg->bktQnSize,CMM_MAX_MAP_ENT);
 #endif                     
 				SPrint(errMsg);
-		  	  RETVALUE(RFAILED);
+		  	  return RFAILED;
 		}
 
 
@@ -578,7 +577,7 @@ CmMmRegCfg  *cfg;
 		
 			sprintf(errMsg,"\n cmMmRegInit() failed, Size of the memory region is less than the required size \n");
 			SPrint(errMsg);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       lstQnSize = ((bktBlkSize / cfg->bktQnSize) + 1) * cfg->bktQnSize;
@@ -680,7 +679,7 @@ CmMmRegCfg  *cfg;
 #endif
             }
 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          cmMmBktInit( &memAddr, regCb, cfg, bktIdx, &lstMapIdx); 
@@ -736,7 +735,7 @@ CmMmRegCfg  *cfg;
              }
           }
 
-          RETVALUE(RFAILED);
+          return RFAILED;
        }
         
        regCb->heapFlag = TRUE;
@@ -746,7 +745,7 @@ CmMmRegCfg  *cfg;
     /* Call SRegRegion to register the memory region with SSI */
     if (SRegRegion(region, &regCb->regInfo) != ROK)
     {
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
 
 /* cm_mem_c_001.main_12 - addition for initializing the hash table */
@@ -754,7 +753,7 @@ CmMmRegCfg  *cfg;
     /* Initialize the region level hash table for debug info storage */
     if (cmMmHashListInit(&regCb->hashListCp, CMM_STAT_HASH_TBL_LEN, region, 0) != ROK)
     {
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
 #endif /* SSI_DEBUG_LEVEL1 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
@@ -764,11 +763,11 @@ CmMmRegCfg  *cfg;
     if(cmHashListInit(&regCb->brdcmSsiLstCp, 1000, offset, FALSE, 
        CM_HASH_KEYTYPE_U32MOD, region, 0) != ROK)
     {
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
 #endif /* SSI_DEBUG_LEVEL1 */
 
-    RETVALUE(ROK);
+    return ROK;
 } /* end of cmMmRegInit*/
 
 
@@ -799,25 +798,24 @@ CmMmRegCfg  *cfg;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmMmRegDeInit
+S16 cmMmRegDeInit
 (
 CmMmRegCb   *regCb
 )
 #else
-PUBLIC S16 cmMmRegDeInit(regCb)
+S16 cmMmRegDeInit(regCb)
 CmMmRegCb   *regCb;
 #endif
 {
    U16  bktIdx; 
 
-   TRC2(cmMmRegDeInit);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
   
    /* error check on parameters */
    if (regCb == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #endif
@@ -827,14 +825,14 @@ CmMmRegCb   *regCb;
     /* Deinitialize the hash table used for debug info storage at region level */
     if (cmMmHashListDeinit(&regCb->hashListCp, regCb->region, 0) != ROK)
     {
-        RETVALUE(RFAILED);
+        return RFAILED;
     }
 #endif /* SSI_DEBUG_LEVEL1 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
     /* Deinitialize the hash table used for broadcom ssi instrumentation */
     if (cmHashListDeinit(&regCb->brdcmSsiLstCp) != ROK)
     {
-        RETVALUE(RFAILED);
+        return RFAILED;
     }
 #endif
 
@@ -878,7 +876,7 @@ CmMmRegCb   *regCb;
 #endif
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmMmRegDeInit */
 
@@ -1110,7 +1108,6 @@ Data  **prevptr;
       prevptr=&prevptr1;
 #endif
 
-   TRC2(cmAlloc);
    
 #ifndef USE_MEMCAL
    UNUSED(flags);
@@ -1127,7 +1124,7 @@ Data  **prevptr;
    /* error check on parameters */
    if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
   
@@ -1136,7 +1133,7 @@ Data  **prevptr;
 #if (ERRCLASS & ERRCLS_INT_PAR)
       if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* (ERRCLASS & ERRCLS_INT_PAR) */
 #endif /* SSI_DEBUG_LEVEL1 */
@@ -1180,7 +1177,7 @@ Data  **prevptr;
       if (regCb->mapTbl[idx].bktIdx == 0xFF)
       { 
          /* Some fatal error in the map table initialization. */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif
 
@@ -1265,7 +1262,7 @@ Data  **prevptr;
                   (Void) SUnlock(&(bkt->bktLock));
 #endif
                   /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */
-                  RETVALUE(RTRAMPLINGNOK);
+                  return (RTRAMPLINGNOK);
                }
                else
 #endif
@@ -1278,7 +1275,7 @@ Data  **prevptr;
                   (Void) SUnlock(&(bkt->bktLock));
 #endif
                   /* return RFAILED */
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
          }
       }
@@ -1288,7 +1285,7 @@ Data  **prevptr;
 #endif
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
       /* Initialize the elements with 0xAB */
-      cmMemset((U8 *)*ptr, 0xAB, *size);
+      memset(*ptr, 0xAB, *size);
 #endif
 //      printf("Pointer allocated %8p size %d\n", *ptr, *size);
       /* Store this pointer in hash list */
@@ -1488,7 +1485,7 @@ Data  **prevptr;
             (Void) SUnlock(&(bkt->bktLock));
 #endif
 
-            RETVALUE(ROK);
+            return ROK;
          }
          else if (flags)
          {
@@ -1555,34 +1552,34 @@ Data  **prevptr;
 #ifdef SS_HISTOGRAM_SUPPORT  
 /* cm_mem_c_001.main_12 - addition for passing an extra parameter */
 #ifdef SSI_DEBUG_LEVEL1
-       RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg));
+       return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg));
 #else
-       RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg));
+       return (cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg));
 #endif /* SSI_DEBUG_LEVEL1 */
 #else
 /* cm_mem_c_001.main_12 - addition for passing an extra parameter */
 #ifdef SSI_DEBUG_LEVEL1
-       RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType));
+       return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType));
 #else
-       RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size));
+       return (cmHeapAlloc(&(regCb->heapCb), ptr, size));
 #endif /* SSI_DEBUG_LEVEL1 */
 #endif /* SS_HISTOGRAM_SUPPORT */
    }
 
    /* No memory available */
-   RETVALUE(RFAILED);
+   return RFAILED;
 #else /* use pure is on */
 /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    *ptr = (Data*) MxHeapAlloc(SsiHeap, *size);
-   cmMemset((U8*)ptr, 0, *size);
+   memset(ptr, 0, *size);
 #else
    *ptr = (Data*) malloc(*size);
 #endif
    if ( (*ptr) == NULLP)
-       RETVALUE(RFAILED);
+       return RFAILED;
    avail_size -= *size;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* USE_PURE */
 
 } /* end of cmAlloc */
@@ -1704,7 +1701,6 @@ Size    size;
 	 U16 memIndex=0;
 #endif
 
-   TRC2(cmFree);
 
    regCb = (CmMmRegCb *)regionCb;
 
@@ -1714,7 +1710,7 @@ Size    size;
    if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start +
                ((CmMmRegCb *)regCb)->regInfo.size) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -1722,7 +1718,7 @@ Size    size;
    /* error check on parameters */
    if ((regCb == NULLP) || (!size) || (ptr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
@@ -1730,13 +1726,13 @@ Size    size;
    if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start +
                ((CmMmRegCb *)regCb)->regInfo.size) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 	/* cm_mem_c_001.main_20 Addition */
 	if (ptr < regCb->regInfo.start)
 	{
-	  RETVALUE(RFAILED);
+	  return RFAILED;
 	}
 
 #endif
@@ -1763,7 +1759,7 @@ Size    size;
       if (regCb->mapTbl[idx].bktIdx == 0xFF)
       { 
          /* Some fatal error in the map table initialization. */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif
 
@@ -1863,7 +1859,7 @@ Size    size;
               (Void) SUnlock(&(bkt->bktLock));
 #endif
 
-              RETVALUE(ROK);
+              return ROK;
            }
            else
 #endif
@@ -1880,7 +1876,7 @@ Size    size;
 #endif
 
                 /* handle RTRAMPLINGNOK in SFree/SPutSBuf */
-                RETVALUE(RTRAMPLINGNOK);
+                return (RTRAMPLINGNOK);
            }
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
          printf("Memory signature is invalid\n");
@@ -1892,7 +1888,7 @@ Size    size;
       ptrHdr->requestedSize = 0;
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
       /* Initialize the elements with 0xAB */
-      cmMemset((U8 *)ptr, 0xAB, size);
+      memset(ptr, 0xAB, size);
 #endif
       /* check if the block to be freed is already having the state as FREE */
       if (CMM_IS_FREE(ptrHdr->memFlags))
@@ -1924,7 +1920,7 @@ Size    size;
           abort();
 #endif
           /* handle RDBLFREE in SFree/SPutSBuf */
-          RETVALUE(RDBLFREE);
+          return (RDBLFREE);
       }
       if (CMM_IS_STATIC(ptrHdr->memFlags))
       {
@@ -1965,7 +1961,7 @@ Size    size;
 #else
             (Void) SUnlock(&(bkt->bktLock));
 #endif
-            RETVALUE(ROK);
+            return ROK;
          }
          else
 #endif
@@ -1982,7 +1978,7 @@ Size    size;
 #endif
 
             /* handle RTRAMPLINGNOK in SFree/SPutSBuf */
-            RETVALUE(RTRAMPLINGNOK);
+            return (RTRAMPLINGNOK);
          }
       }
 #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
@@ -2190,18 +2186,17 @@ Size    size;
       (Void) SUnlock(&(bkt->bktLock));
 #endif
 
-      RETVALUE(ROK);
+      return ROK;
    }
 
    /* The memory block was allocated from the heap pool */ 
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-   RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg));
+   return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg));
 #else
-   RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size));
+   return (cmHeapFree (&(regCb->heapCb), ptr, size));
 #endif /* SS_HISTOGRAM_SUPPORT */
 #else /* use pure is on */
-   TRC2(cmFree);
 /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    (Void)MxHeapFree(SsiHeap, ptr);
@@ -2209,7 +2204,7 @@ Size    size;
    (Void)free(ptr);
 #endif
    avail_size += size;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* USE_PURE */
 
 
@@ -2251,7 +2246,7 @@ Size    size;
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef SSI_DEBUG_LEVEL1
 #ifdef ANSI
-PUBLIC S16  cmAllocNL
+S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
@@ -2264,7 +2259,7 @@ U8      entId,
 Bool    hstReg
 )
 #else
-PUBLIC S16  cmAllocNL(regionCb, size, flags, ptr, memType, 
+S16  cmAllocNL(regionCb, size, flags, ptr, memType, 
       line, fileName, entId, hstReg)
 Void   *regionCb;
 Size   *size;
@@ -2278,7 +2273,7 @@ Bool    hstReg;
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16  cmAllocNL
+S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
@@ -2290,7 +2285,7 @@ U8      entId,
 Bool    hstReg
 )
 #else
-PUBLIC S16  cmAllocNL(regionCb, size, flags, ptr, line, 
+S16  cmAllocNL(regionCb, size, flags, ptr, line, 
       fileName, entId, hstReg)
 Void   *regionCb;
 Size   *size;
@@ -2306,7 +2301,7 @@ Bool    hstReg;
 #else
 #ifdef SS_LIGHT_MEM_LEAK_STS
 #ifdef ANSI
-PUBLIC S16  cmAllocNL
+S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
@@ -2317,7 +2312,7 @@ U32     lineNo,
 U8     *funcName
 )
 #else
-PUBLIC S16  cmAllocNL(regionCb, size, flags, ptr ,memType, lineNo, funcName)
+S16  cmAllocNL(regionCb, size, flags, ptr ,memType, lineNo, funcName)
 Void   *regionCb;
 Size   *size;
 U32     flags;
@@ -2329,7 +2324,7 @@ U8     *funcName;
 #else /*SS_LIGHT_MEM_LEAK_STS */
 #ifdef SSI_DEBUG_LEVEL1
 #ifdef ANSI
-PUBLIC S16  cmAllocNL
+S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
@@ -2338,7 +2333,7 @@ Data  **ptr,
 U32     memType
 )
 #else
-PUBLIC S16  cmAllocNL(regionCb, size, flags, ptr, memType)
+S16  cmAllocNL(regionCb, size, flags, ptr, memType)
 Void   *regionCb;
 Size   *size;
 U32     flags;
@@ -2348,7 +2343,7 @@ U32     memType;
 #else
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
 #ifdef ANSI
-PUBLIC S16  cmAllocNL
+S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
@@ -2357,7 +2352,7 @@ Data  **ptr,
 U32     memType
 )
 #else
-PUBLIC S16  cmAllocNL(regionCb, size, flags, ptr, memType)
+S16  cmAllocNL(regionCb, size, flags, ptr, memType)
 Void   *regionCb;
 Size   *size;
 U32     flags;
@@ -2366,7 +2361,7 @@ U32     memType;
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16  cmAllocNL
+S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
@@ -2374,7 +2369,7 @@ U32     flags,
 Data  **ptr 
 )
 #else
-PUBLIC S16  cmAllocNL(regionCb, size, flags, ptr)
+S16  cmAllocNL(regionCb, size, flags, ptr)
 Void   *regionCb;
 Size   *size;
 U32     flags;
@@ -2413,7 +2408,6 @@ Data  **ptr;
    S8 hstGrmBuf[256];
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC2(cmAllocNL);
 
 #ifndef USE_MEMCAL
    UNUSED(flags);
@@ -2430,7 +2424,7 @@ Data  **ptr;
    /* error check on parameters */
    if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -2439,7 +2433,7 @@ Data  **ptr;
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* (ERRCLASS & ERRCLS_INT_PAR) */
 #endif /* SSI_DEBUG_LEVEL1 */
@@ -2484,7 +2478,7 @@ Data  **ptr;
       if (regCb->mapTbl[idx].bktIdx == 0xFF)
       { 
          /* Some fatal error in the map table initialization. */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif
 
@@ -2554,12 +2548,12 @@ Data  **ptr;
                if (cmMmBktSanityChk(bkt) == RTRAMPLINGNOK)
                {
                   /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */
-                  RETVALUE(RTRAMPLINGNOK);
+                  return (RTRAMPLINGNOK);
                }
                else
                {
                   /* return RFAILED */
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
 #endif
             }
@@ -2570,7 +2564,7 @@ Data  **ptr;
 #endif
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
          /* Initialize the elements with 0xAB */
-         cmMemset((U8 *)*ptr, 0xAB, *size);
+         memset(*ptr, 0xAB, *size);
 #endif
          if ((bkt->nextBlk) && *ptr)
 #elif SS_LIGHT_MEM_LEAK_STS
@@ -2697,7 +2691,7 @@ Data  **ptr;
 
             /* cm_mem_c_008.104 - Addition for memory calculator tool */
 
-            RETVALUE(ROK);
+            return ROK;
          }
          else if (flags)
          {
@@ -2759,36 +2753,36 @@ Data  **ptr;
 #ifdef SS_HISTOGRAM_SUPPORT  
       /* cm_mem_c_001.main_12 - addition for passing an extra parameter */
 #ifdef SSI_DEBUG_LEVEL1
-      RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, 
+      return (cmHeapAlloc(&(regCb->heapCb), ptr, size, 
                memType, line, fileName, entId, hstReg));
 #else
-      RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, 
+      return (cmHeapAlloc(&(regCb->heapCb), ptr, size, 
                line, fileName, entId, hstReg));
 #endif /* SSI_DEBUG_LEVEL1 */
 #else
       /* cm_mem_c_001.main_12 - addition for passing an extra parameter */
 #ifdef SSI_DEBUG_LEVEL1
-      RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType));
+      return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType));
 #else
-      RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size));
+      return (cmHeapAlloc(&(regCb->heapCb), ptr, size));
 #endif /* SSI_DEBUG_LEVEL1 */
 #endif /* SS_HISTOGRAM_SUPPORT */
    }
 
    /* No memory available */
-   RETVALUE(RFAILED);
+   return RFAILED;
 #else /* use pure is on */
    /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    *ptr = (Data*) MxHeapAlloc(SsiHeap, *size);
-   cmMemset((U8*)ptr, 0, *size);
+   memset(ptr, 0, *size);
 #else
    *ptr = (Data*) malloc(*size);
 #endif
    if ( (*ptr) == NULLP)
-      RETVALUE(RFAILED);
+      return RFAILED;
    avail_size -= *size;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* USE_PURE */
 
 } /* end of cmAllocNL */
@@ -2819,7 +2813,7 @@ Data  **ptr;
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_LIGHT_MEM_LEAK_STS
 #ifdef ANSI
-PUBLIC S16  cmFreeNL
+S16  cmFreeNL
 (
 Void   *regionCb,
 Data   *ptr, 
@@ -2828,7 +2822,7 @@ U32     lineNo,
 U8      *funcName
 )
 #else
-PUBLIC S16  cmFreeNL(regionCb, ptr, size, lineNo, funcName)
+S16  cmFreeNL(regionCb, ptr, size, lineNo, funcName)
 Void   *regionCb;
 Data   *ptr;
 Size    size;
@@ -2839,7 +2833,7 @@ U8      *funcName;
 
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef ANSI
-PUBLIC S16  cmFreeNL
+S16  cmFreeNL
 (
 Void   *regionCb,
 Data   *ptr,
@@ -2850,7 +2844,7 @@ U8      entId,
 Bool    hstReg
 )
 #else
-PUBLIC S16  cmFreeNL(regionCb, ptr, size, line, fileName, entId, hstReg)
+S16  cmFreeNL(regionCb, ptr, size, line, fileName, entId, hstReg)
 Void   *regionCb;
 Data   *ptr;
 Size    size;
@@ -2863,14 +2857,14 @@ Bool    hstReg;
 #else
 
 #ifdef ANSI
-PUBLIC S16  cmFreeNL
+S16  cmFreeNL
 (
 Void   *regionCb,
 Data   *ptr, 
 Size    size
 )
 #else
-PUBLIC S16  cmFreeNL(regionCb, ptr, size)
+S16  cmFreeNL(regionCb, ptr, size)
 Void   *regionCb;
 Data   *ptr;
 Size    size;
@@ -2897,7 +2891,6 @@ Size    size;
    S8 hstGrmBuf[256];
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC2(cmFreeNL);
 
    regCb = (CmMmRegCb *)regionCb;
 
@@ -2907,7 +2900,7 @@ Size    size;
    if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start +
          ((CmMmRegCb *)regCb)->regInfo.size) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2915,20 +2908,20 @@ Size    size;
    /* error check on parameters */
    if ((regCb == NULLP) || (!size) || (ptr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
    /* Check if the memory block is from the memory region */
    if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start +
          ((CmMmRegCb *)regCb)->regInfo.size) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
    /* cm_mem_c_001.main_20 Addition */
    if (ptr < regCb->regInfo.start)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #endif
@@ -2948,7 +2941,7 @@ Size    size;
       if (regCb->mapTbl[idx].bktIdx == 0xFF)
       { 
          /* Some fatal error in the map table initialization. */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif
 
@@ -3025,12 +3018,12 @@ Size    size;
          {
             bkt->numAlloc--;
 
-            RETVALUE(ROK);
+            return ROK;
          }
          else
          {
             /* handle RTRAMPLINGNOK in SFree/SPutSBuf */
-            RETVALUE(RTRAMPLINGNOK);
+            return (RTRAMPLINGNOK);
          }
 #endif
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
@@ -3042,7 +3035,7 @@ Size    size;
       ptrHdr->requestedSize = 0;
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
       /* Initialize the elements with 0XAB */
-      cmMemset((U8 *)ptr, 0xAB, size);
+      memset(ptr, 0xAB, size);
 #endif
       /* check if the block to be freed is already having the state as FREE */
       if (CMM_IS_FREE(ptrHdr->memFlags))
@@ -3070,7 +3063,7 @@ Size    size;
 #endif
 
          /* handle RDBLFREE in SFree/SPutSBuf */
-         RETVALUE(RDBLFREE);
+         return (RDBLFREE);
       }
       if (CMM_IS_STATIC(ptrHdr->memFlags))
       {
@@ -3104,12 +3097,12 @@ Size    size;
          {
             /* do not add to the free list */
             bkt->numAlloc--;
-            RETVALUE(ROK);
+            return ROK;
          }
          else
          {
             /* handle RTRAMPLINGNOK in SFree/SPutSBuf */
-            RETVALUE(RTRAMPLINGNOK);
+            return (RTRAMPLINGNOK);
          }
 #endif
       }
@@ -3186,18 +3179,17 @@ Size    size;
       cmRlsAllocBlk((PTR)ptr);
 #endif /* SS_MEM_LEAK_STS */
 
-      RETVALUE(ROK);
+      return ROK;
    }
 
    /* The memory block was allocated from the heap pool */ 
    /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-   RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg));
+   return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg));
 #else
-   RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size));
+   return (cmHeapFree (&(regCb->heapCb), ptr, size));
 #endif /* SS_HISTOGRAM_SUPPORT */
 #else /* use pure is on */
-   TRC2(cmFreeNL);
    /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    (Void)MxHeapFree(SsiHeap, ptr);
@@ -3205,7 +3197,7 @@ Size    size;
    (Void)free(ptr);
 #endif
    avail_size += size;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* USE_PURE */
 } /* end of cmFreeNL */
 
@@ -3248,7 +3240,6 @@ Data  **ptr;
    CmMmRegCb *regCb;
    /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/
 
-   TRC2(cmAllocWL);
 
    /*cm_mem_c_001.main_23 Removed support of  USE_MEMCAL and MEMCAL_DEBUG support for  SS_FAP*/
 
@@ -3259,7 +3250,7 @@ Data  **ptr;
    /* error check on parameters */
    if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
   
@@ -3300,7 +3291,7 @@ Data  **ptr;
             /* Update the size parameter */
             *size = bkt->size;
 
-            RETVALUE(ROK);
+            return ROK;
          }
       }
    }
@@ -3314,23 +3305,23 @@ Data  **ptr;
        * heap pool.
        */ 
        /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/
-       RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size));
+       return (cmHeapAlloc(&(regCb->heapCb), ptr, size));
    }
 
    /* No memory available */
-   RETVALUE(RFAILED);
+   return RFAILED;
 #else /* use pure is on */
 /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    *ptr = (Data*) MxHeapAlloc(SsiHeap, *size);
-   cmMemset((U8*)ptr, 0, *size);
+   memset(ptr, 0, *size);
 #else
    *ptr = (Data*) malloc(*size);
 #endif
    if ( (*ptr) == NULLP)
-       RETVALUE(RFAILED);
+       return RFAILED;
    avail_size -= *size;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* USE_PURE */
 
 } /* end of cmAllocWL */
@@ -3370,7 +3361,6 @@ Size    size;
    CmMmRegCb *regCb;
    /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/
 
-   TRC2(cmFreeWL);
 
    regCb = (CmMmRegCb *)regionCb;
 
@@ -3380,14 +3370,14 @@ Size    size;
    /* error check on parameters */
    if ((regCb == NULLP) || (!size) || (ptr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Check if the memory block is from the memory region */
    if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start +
                ((CmMmRegCb *)regCb)->regInfo.size) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #endif
@@ -3407,7 +3397,7 @@ Size    size;
       if (regCb->mapTbl[idx].bktIdx == 0xFF)
       { 
          /* Some fatal error in the map table initialization. */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif
 
@@ -3436,13 +3426,12 @@ Size    size;
       */
       bkt->numAlloc--;
 
-      RETVALUE(ROK);
+      return ROK;
    }
 
    /* The memory block was allocated from the heap pool */ 
-   RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size));
+   return (cmHeapFree (&(regCb->heapCb), ptr, size));
 #else /* use pure is on */
-   TRC2(cmFree);
 /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    (Void)MxHeapFree(SsiHeap, ptr);
@@ -3450,7 +3439,7 @@ Size    size;
    (Void)free(ptr);
 #endif
    avail_size += size;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* USE_PURE */
 
 
@@ -3497,7 +3486,6 @@ SMemCtl *memCtl;
 {
    CmMmRegCb *regCb;
 
-   TRC2(cmCtl);
 
    regCb = (CmMmRegCb *)regionCb;
 
@@ -3506,7 +3494,7 @@ SMemCtl *memCtl;
    /* error check on parameters */
    if ((regCb == NULLP) || (memCtl == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #endif
@@ -3521,7 +3509,7 @@ SMemCtl *memCtl;
          if ((memCtl->u.vtop.vaddr == NULLP) || 
              (memCtl->u.vtop.paddr == NULLP))
          {
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 #endif
    
@@ -3531,7 +3519,7 @@ SMemCtl *memCtl;
             offset = memCtl->u.vtop.vaddr - regCb->regInfo.start;
             *(memCtl->u.vtop.paddr) = regCb->pAddr + offset;
    
-            RETVALUE(ROK);
+            return ROK;
          }
          break;
       }
@@ -3543,7 +3531,7 @@ SMemCtl *memCtl;
          if (!(memCtl->u.chkres.size) || 
             (memCtl->u.chkres.status == NULLP))
          {
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 #endif
 #ifndef USE_PURE
@@ -3578,11 +3566,11 @@ SMemCtl *memCtl;
                                           (regCb->heapSize/10)); 
          }
 
-         RETVALUE(ROK);
+         return ROK;
 #else /* use pure is on */
             *(memCtl->u.chkres.status) = ((avail_size) /
                                           (regCb->regInfo.size/10));
-         RETVALUE(ROK);
+         return ROK;
 #endif /* USE_PURE */
 
       }
@@ -3590,12 +3578,12 @@ SMemCtl *memCtl;
       default:
       {
          /* No other event is supported currently */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
    /* shouldn't reach here */
-   RETVALUE(RFAILED);
+   return RFAILED;
 } /* end of cmCtl */
 
 
@@ -3654,7 +3642,6 @@ U16        *lstMapIdx;
 #endif
 #endif /* SSI_DEBUG_LEVEL1 */
 
-   TRC2(cmMmBktInit);
 
 
    size = cfg->bktCfg[bktIdx].size; 
@@ -3888,7 +3875,6 @@ Size         size;
 #ifdef SSI_DEBUG_LEVEL1
    U16 idx;
 #endif /* SSI_DEBUG_LEVEL1 */
-   TRC2(cmMmHeapInit);
 
    /* Initialize the heap control block */
    heapCb->vStart      = memAddr;
@@ -4062,7 +4048,6 @@ Size        *size;
 	S8 hstGrmBuf[256];
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC2(cmHeapAlloc);
 /*  cm_mem_c_001.main_15 : Additions */
    /* Acquire the heap lock */ 
    /* cm_mem_c_001.main_13 : Replaced SLock with WTLock for NT */
@@ -4103,7 +4088,7 @@ Size        *size;
 #else
                         (Void) SUnlock (&(heapCb->heapLock));
 #endif
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
 
@@ -4199,7 +4184,7 @@ Size        *size;
                         (Void) SUnlock (&(heapCb->heapLock));
 #endif
                         /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */
-                        RETVALUE(RTRAMPLINGNOK);
+                        return (RTRAMPLINGNOK);
                      }
                      else
                      {
@@ -4211,7 +4196,7 @@ Size        *size;
 #else
                         (Void) SUnlock (&(heapCb->heapLock));
 #endif
-                        RETVALUE(RFAILED);
+                        return RFAILED;
                      }
                }
             }
@@ -4282,7 +4267,7 @@ Size        *size;
 
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-         RETVALUE(ROK);
+         return ROK;
       }
    }
 
@@ -4300,7 +4285,7 @@ Size        *size;
    (Void) SUnlock (&(heapCb->heapLock));
 #endif
 
-   RETVALUE(ROUTRES);
+   return (ROUTRES);
 
 } /* end of cmHeapAlloc */
 
@@ -4380,7 +4365,6 @@ Size         size;
 	S8 hstGrmBuf[256];
 #endif /* SS_HISTOGRAM_SUPPORT */
 
-   TRC2(cmHeapFree);
 
    /* Roundup the requested size */
    size = CMM_DATALIGN(size, (heapCb->minSize));
@@ -4447,7 +4431,7 @@ Size         size;
          (Void) SUnlock (&(heapCb->heapLock));
 #endif
          /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */
-         RETVALUE(RTRAMPLINGNOK);
+         return (RTRAMPLINGNOK);
       }
       else
       {
@@ -4461,7 +4445,7 @@ Size         size;
          (Void) SUnlock (&(heapCb->heapLock));
 #endif
 
-         RETVALUE(ROK);
+         return ROK;
       }
    }
 
@@ -4486,7 +4470,7 @@ Size         size;
          (Void) SUnlock (&(heapCb->heapLock));
 #endif
 
-      RETVALUE(RDBLFREE);
+      return (RDBLFREE);
    }
 #endif /* SSI_DEBUG_LEVEL1 */
 
@@ -4544,7 +4528,7 @@ Size         size;
 #endif
 
                    /* This block is already freed in the heap */
-                   RETVALUE(RDBLFREE);
+                   return (RDBLFREE);
                 }
                 /* update the flags as it is a new node */
                 if (CMM_IS_STATIC(p->memFlags))
@@ -4605,7 +4589,7 @@ Size         size;
             }
          }/* End of if */
 #endif /* SS_HISTOGRAM_SUPPORT */
-            RETVALUE(ROK);
+            return ROK;
          }
       }
       else if (p < curHBlk)
@@ -4676,7 +4660,7 @@ Size         size;
             }
          }/* End of if */
 #endif /* SS_HISTOGRAM_SUPPORT */
-         RETVALUE(ROK);
+         return ROK;
       }
 
    }
@@ -4725,7 +4709,7 @@ Size         size;
             }
          }/* End of if */
 #endif /* SS_HISTOGRAM_SUPPORT */
-      RETVALUE(ROK);
+      return ROK;
    }
 
    /* Release the lock */
@@ -4736,40 +4720,40 @@ Size         size;
    (Void) SUnlock (&(heapCb->heapLock));
 #endif
 
-   RETVALUE(RFAILED);
+   return RFAILED;
 } /* end of cmHeapFree */
 #endif/*USE_PURE*/
 #ifdef SS_LIGHT_MEM_LEAK_STS
 #ifdef ANSI
-PUBLIC U32 cmGetFreeIndx
+U32 cmGetFreeIndx
 (
 Void
 )
 #else
-PUBLIC U32 cmGetFreeIndx(Void)
+U32 cmGetFreeIndx(Void)
 #endif
 {
 
     if(gmemLkCb.head == gmemLkCb.tail)
     {
        allocQueueEmptyCnt++;
-       RETVALUE(CM_MAX_ALLOC_ENTERIES);
+       return (CM_MAX_ALLOC_ENTERIES);
     }
     else
     {
        U32 allocQIndx = gmemLkCb.queue[gmemLkCb.head];
        gmemLkCb.head = (gmemLkCb.head +1) % CM_MAX_ALLOC_ENTERIES;
-       RETVALUE(allocQIndx);
+       return (allocQIndx);
     }
  
 }
 #ifdef ANSI
-PUBLIC U32 cmPutFreeIndx
+U32 cmPutFreeIndx
 (
 U32   allocQIndx
 )
 #else
-PUBLIC U32 cmPutFreeIndx(allocQIndx)
+U32 cmPutFreeIndx(allocQIndx)
 U32   allocQIndx;
 #endif
 
@@ -4778,13 +4762,13 @@ U32   allocQIndx;
     if(tmpTail == gmemLkCb.head)
     {
        allocQueueFullCnt++;
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
     else
     {
        gmemLkCb.queue[gmemLkCb.tail]  = allocQIndx;
        gmemLkCb.tail = tmpTail;
-       RETVALUE(ROK);
+       return ROK;
     }
 }
 /*
@@ -4803,17 +4787,16 @@ U32   allocQIndx;
 *
 */
 #ifdef ANSI
-PUBLIC Void cmInitMemLeak
+Void cmInitMemLeak
 (
 Void
 )
 #else
-PUBLIC Void cmInitMemLeak (Void)
+Void cmInitMemLeak (Void)
 #endif
 {
    U32   indx;  
 
-   TRC3(cmInitMemLeak);
 
    gmemLkCb.isStarted = FALSE;
    gmemLkCb.head      = 0;
@@ -4843,17 +4826,16 @@ PUBLIC Void cmInitMemLeak (Void)
  * 
  **/
 #ifdef ANSI
-PUBLIC Void cmDeinitMemLeak
+Void cmDeinitMemLeak
 (
 Void
 )
 #else
-PUBLIC Void cmDeinitMemLeak (Void)
+Void cmDeinitMemLeak (Void)
 #endif
 {
    U32   indx;  
 
-   TRC3(cmDeinitMemLeak);
  
    for(indx = 0; indx < CM_MAX_ALLOC_ENTERIES; indx++)
    {
@@ -4881,12 +4863,12 @@ PUBLIC Void cmDeinitMemLeak (Void)
 *
 */
 #ifdef ANSI
-PUBLIC U32 cmStorAllocBlk
+U32 cmStorAllocBlk
 (
 Void    *addr
 )
 #else
-PUBLIC U32 cmStorAllocBlk (addr)
+U32 cmStorAllocBlk (addr)
 Void    *addr;
 #endif /* ANSI */
 
@@ -4903,7 +4885,7 @@ Void    *addr;
    }
   (Void) SUnlock(&(gmemLkCb.memLock));
    
-   RETVALUE(allocQIndx);
+   return (allocQIndx);
 } /* cmStorAllocBlk */
 
 
@@ -4923,16 +4905,15 @@ Void    *addr;
 *
 */
 #ifdef ANSI
-PUBLIC Void cmRlsAllocBlk
+Void cmRlsAllocBlk
 (
 U32    allocQIndx
 )
 #else
-PUBLIC Void cmRlsAllocBlk(allocQIndx)
+Void cmRlsAllocBlk(allocQIndx)
 U32    allocQIndx;
 #endif
 {
-   TRC3(cmRlsAllocBlk);
    
    if(allocQIndx < CM_MAX_ALLOC_ENTERIES)
    {
@@ -4960,12 +4941,12 @@ U32    allocQIndx;
 *
 */
 #ifdef ANSI
-PUBLIC Void cmStartStopLeakLog
+Void cmStartStopLeakLog
 (
 Void
 )
 #else
-PUBLIC Void cmStartStopLeakLog(Void)
+Void cmStartStopLeakLog(Void)
 #endif
 {
    if (FALSE == gmemLkCb.isStarted)
@@ -4996,12 +4977,12 @@ PUBLIC Void cmStartStopLeakLog(Void)
 *
 */
 #ifdef ANSI
-PUBLIC Void cmPrintLeakLog
+Void cmPrintLeakLog
 (
 Void
 )
 #else
-PUBLIC Void cmPrintLeakLog(Void)
+Void cmPrintLeakLog(Void)
 #endif
 {
  
@@ -5009,7 +4990,6 @@ PUBLIC Void cmPrintLeakLog(Void)
    CmMmBlkHdr *aBkt;
    static U32 leakCount =0; 
 
-   TRC3(cmPrintLeakLog);
 
    printf("---- START OF LEAK LOG ----");
    SLock(&gmemLkCb.memLock);
@@ -5057,19 +5037,19 @@ PUBLIC Void cmPrintLeakLog(Void)
 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
 #ifdef ANSI
-PUBLIC Void cmRlsAllocBlk
+Void cmRlsAllocBlk
 (
 CmMmBlkHdr  *ptrHdr,
 CmMmRegCb *regCb
 )
 #else
-PUBLIC Void cmRlsAllocBlk(ptrHdr, regCb)
+Void cmRlsAllocBlk(ptrHdr, regCb)
 CmMmBlkHdr  *ptrHdr;
 CmMmRegCb *regCb;
 #endif
 #else
 #ifdef ANSI
-PUBLIC Void cmRlsAllocBlk
+Void cmRlsAllocBlk
 (
 #ifdef BIT_64
 U64    addr
@@ -5078,7 +5058,7 @@ U32    addr
 #endif
 )
 #else
-PUBLIC Void cmRlsAllocBlk(addr)
+Void cmRlsAllocBlk(addr)
 #ifdef BIT_64
 U64    addr;
 #else
@@ -5097,7 +5077,6 @@ U32    addr;
     MemAllocInfo  *memAllocInfo;
 #endif
 
-    TRC3(cmRlsAllocBlk);
 
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
 #ifdef BIT_64
@@ -5238,7 +5217,7 @@ U32    addr;
 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
 #ifdef ANSI
-PUBLIC Void cmStorAllocBlk
+Void cmStorAllocBlk
 (
 CmMmBlkHdr    *ptrHdr, 
 Size          reqSz,
@@ -5247,7 +5226,7 @@ U16           bktIdx,
 CmMmRegCb     *regCb
 )
 #else
-PUBLIC Void cmStorAllocBlk (ptrHdr, reqSz, allocSz, bktIdx, regCb)
+Void cmStorAllocBlk (ptrHdr, reqSz, allocSz, bktIdx, regCb)
 CmMmBlkHdr    *ptrHdr;
 Size          reqSz;
 Size          allocSz;
@@ -5256,7 +5235,7 @@ CmMmRegCb     *regCb;
 #endif
 #else
 #ifdef ANSI
-PUBLIC Void cmStorAllocBlk
+Void cmStorAllocBlk
 (
 #ifdef BIT_64
 U64    addr,
@@ -5268,7 +5247,7 @@ Size   allocSz,
 U16    bktIdx
 )
 #else
-PUBLIC Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx)
+Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx)
 #ifdef BIT_64
 U64    addr;
 #else
@@ -5292,7 +5271,6 @@ U16    bktIdx;
    S32           traceSize;
 #endif
 
-   TRC3(cmStorAllocBlk); 
 #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
    if( memLkCb.memLkMdlInit == FALSE)
    {
@@ -5306,7 +5284,7 @@ U16    bktIdx;
 /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
    funcNm = (S8 **)MxHeapAlloc(SsiHeap, (sizeof(U32) * CM_MAX_STACK_TRACE));
-   cmMemset((U8*)funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE));
+   memset(funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE));
 #else
    funcNm = (S8 **)calloc(1, (sizeof(U32) * CM_MAX_STACK_TRACE));
 #endif
@@ -5328,7 +5306,7 @@ U16    bktIdx;
 #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
 #ifdef SS_4GMX_LCORE
    allocInfo = (MemAllocInfo *)MxHeapAlloc(SsiHeap, sizeof(MemAllocInfo)); 
-   cmMemset((U8*)allocInfo, 0, sizeof(MemAllocInfo));
+   memset(allocInfo, 0, sizeof(MemAllocInfo));
 #else
    allocInfo = (MemAllocInfo *)calloc(1, sizeof(MemAllocInfo));  
 #endif
@@ -5338,7 +5316,7 @@ U16    bktIdx;
    /* check if hashListCp is initialised yet */
    if ( regCb->brdcmSsiLstCp.nmbBins == 0)
    {
-      RETVALUE(ROK);
+      return ROK;
    }
    ptrHdr->reqSz      = reqSz;
    ptrHdr->allocSz    = allocSz;
@@ -5384,12 +5362,12 @@ U16    bktIdx;
 *
 */
 #ifdef ANSI
-PUBLIC Void SLogLkInfo
+Void SLogLkInfo
 (
 Void
 )
 #else
-PUBLIC Void SLogLkInfo (Void)
+Void SLogLkInfo (Void)
 #endif
 {
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
@@ -5402,7 +5380,6 @@ PUBLIC Void SLogLkInfo (Void)
    CmMmRegCb          *tmpRegCb;
    FILE               *fp;
 
-   TRC3(SLogLkInfo);
    fp = fopen("meLeakLog.txt", "w");
    if(fp == NULL)
    {
@@ -5460,7 +5437,6 @@ PUBLIC Void SLogLkInfo (Void)
    U8                 idx;
    Txt                prntBuf[255];
    S8                 **funcNm;
-   TRC3(SLogLkInfo);
    if( memLkCb.memLkMdlInit == FALSE)
    {
      RETVOID;
@@ -5543,18 +5519,17 @@ PUBLIC Void SLogLkInfo (Void)
 *
 */
 #ifdef ANSI
-PUBLIC Void cmInitMemLeakMdl
+Void cmInitMemLeakMdl
 (
 Void
 )
 #else
-PUBLIC Void cmInitMemLeakMdl (Void)
+Void cmInitMemLeakMdl (Void)
 #endif
 {
    U8   memMdl;
 	U8   hashIdx;
 
-   TRC3(cmInitMemLeakMdl);
 
    memLkCb.memLkMdlInit = FALSE;
    for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++)
@@ -5592,18 +5567,17 @@ PUBLIC Void cmInitMemLeakMdl (Void)
  * 
  **/
 #ifdef ANSI
-PUBLIC Void cmDeinitMemLeakMdl
+Void cmDeinitMemLeakMdl
 (
 Void
 )
 #else
-PUBLIC Void cmDeinitMemLeakMdl (Void)
+Void cmDeinitMemLeakMdl (Void)
 #endif
 {
   U8   memMdl;
   U8   hashIdx;
 
-  TRC3(cmDeinitMemLeakMdl);
 
   memLkCb.memLkMdlInit = FALSE;
   for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++)
@@ -5633,16 +5607,15 @@ PUBLIC Void cmDeinitMemLeakMdl (Void)
 *
 */
 #ifdef ANSI
-PUBLIC Void cmMemOpenMemLkFile
+Void cmMemOpenMemLkFile
 (
 S8 *arg
 )
 #else
-PUBLIC Void cmMemOpenMemLkFile (arg)
+Void cmMemOpenMemLkFile (arg)
 S8 *msOptArg;
 #endif
 {
-   TRC3(cmMemOpenMemLkFile);
    memLkCb.fileLkLog = NULLP;
    memLkCb.fileLkLog = fopen(arg, "w");
    RETVOID;
@@ -5663,12 +5636,12 @@ S8 *msOptArg;
 *
 */
 #ifdef ANSI
-PUBLIC Void SFlushLkInfo
+Void SFlushLkInfo
 (
 Void
 )
 #else
-PUBLIC Void SFlushLkInfo (Void)
+Void SFlushLkInfo (Void)
 #endif
 {
    MemAllocInfo      *newMemInfo;
@@ -5679,7 +5652,6 @@ PUBLIC Void SFlushLkInfo (Void)
    U8                 i;
 #endif /* SS_MEM_LEAK_SOL */
 
-   TRC3(SFlushLkInfo);
    if( memLkCb.memLkMdlInit == FALSE)
    {
      RETVOID;
@@ -5741,13 +5713,13 @@ PUBLIC Void SFlushLkInfo (Void)
 *
 */
 #ifdef ANSI
-PUBLIC U8 cmMemGetModuleId
+U8 cmMemGetModuleId
 (
 S8     **funNm,
 S32    traceSize
 )
 #else
-PUBLIC U8 cmMemGetModuleId (funNm, traceSize)
+U8 cmMemGetModuleId (funNm, traceSize)
 S8     **funNm;
 S32    traceSize;
 #endif /* ANSI */
@@ -5762,7 +5734,6 @@ S32    traceSize;
    Txt   *memFn[]={"SGetMsg", "SGetSBuf", "SGetDBuf", NULLP};
                  
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC3(cmMemGetModuleId)
    for(idx = 0; idx < traceSize; idx++)
    {
       memReqIdx = -1;
@@ -5782,7 +5753,7 @@ S32    traceSize;
                                         funNm);
          if(memReqIdx >= 0)
          {
-            RETVALUE(mdlFunStrIdx);
+            return (mdlFunStrIdx);
          }
          mdlFunStrIdx++;
       }
@@ -5793,13 +5764,13 @@ S32    traceSize;
                                (const S8 *)memUsrMdlStr[mdlFunStrIdx].fPStr);
          if(retVal == NULLD)
          {
-            RETVALUE(mdlFunStrIdx);
+            return (mdlFunStrIdx);
          } 
          mdlFunStrIdx++;
       }
    }
 
-   RETVALUE(0);
+   return (0);
 } /* cmMemGetModuleId */
 
 /*
@@ -5818,7 +5789,7 @@ S32    traceSize;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmMemGetStrMtchIdx  
+S16 cmMemGetStrMtchIdx  
 (
 U8 strtIdx, 
 U8 endIdx,
@@ -5826,7 +5797,7 @@ S8 *str,
 S8 **strLst
 )
 #else
-PUBLIC S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst)
+S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst)
 U8 strtIdx;
 U8 endIdx;
 S8 *str;
@@ -5840,7 +5811,6 @@ S8 **strLst;
    U32  tempLen;
    U8   idx;
    S32  retVal;
-   TRC3(cmMemGetStrMtchIdx);
 
    len = strlen((const S8 *)str);
    cmpStr[0] = '(';
@@ -5870,9 +5840,9 @@ S8 **strLst;
 
    if(!found)
    {
-     RETVALUE(-1); 
+     return (-1); 
    }
-   RETVALUE(strtIdx);
+   return (strtIdx);
 
 }  /* cmMemGetStrMtchIdx */
 #ifdef SS_MEM_LEAK_SOL
@@ -5892,14 +5862,14 @@ S8 **strLst;
 *
 */
 #ifdef ANSI
-PUBLIC S32 cmAddrToSymStr
+S32 cmAddrToSymStr
 (
 Void   *pc, 
 S8     *buffer, 
 S32    size
 )
 #else
-PUBLIC S32 cmAddrToSymStr(pc, buffer, size)
+S32 cmAddrToSymStr(pc, buffer, size)
 Void   *pc;
 S8     *buffer;
 S32    size;
@@ -5909,24 +5879,23 @@ S32    size;
    Dl_info info;
    Sym *sym;
 
-   TRC3(cmAddrToSymStr);
 
    if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0)
    {
-       RETVALUE(snprintf(buffer, size, "[0x%p]", pc));
+       return (snprintf(buffer, size, "[0x%p]", pc));
    }
 
    if ((info.dli_fname != NULLP && info.dli_sname != NULLP) &&
        ((uintptr_t)pc - (uintptr_t)info.dli_saddr < sym->st_size))
    {
-      RETVALUE(snprintf(buffer, size, "%s(%s+0x%x) [0x%p]",
+      return (snprintf(buffer, size, "%s(%s+0x%x) [0x%p]",
                        info.dli_fname,
                        info.dli_sname,
                        (unsigned long)pc - (unsigned long)info.dli_saddr, pc));
    }
    else
    {
-      RETVALUE(snprintf(buffer, size, "%s(0x%p [0x%p]",
+      return (snprintf(buffer, size, "%s(0x%p [0x%p]",
                       info.dli_fname,
                       (unsigned long)pc - (unsigned long)info.dli_fbase, pc));
    }
@@ -5949,29 +5918,28 @@ S32    size;
 *
 */
 #ifdef ANSI
-PUBLIC S32 cmLeakCallBack
+S32 cmLeakCallBack
 (
 uintptr_t pc,
 S32       sigNo, 
 Void      *arg
 )
 #else
-PUBLIC S32 cmLeakCallBack(pc, sigNo, arg)
+S32 cmLeakCallBack(pc, sigNo, arg)
 uintptr_t pc;
 S32       sigNo;
 Void      *arg;
 #endif
 {
     S8   *buffer;
-    TRC3(cmLeakCallBack);
 
     Backtrace_t *bt = (Backtrace_t *)arg;
     if (bt->bt_actcount >= bt->bt_maxcount)
-         RETVALUE(-1);
+         return (-1);
 /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/   
 #ifdef SS_4GMX_LCORE
     buffer = (S8 *)MxHeapAlloc(SsiHeap, 510); 
-    cmMemset((U8*)buffer, 0, 510);
+    memset(buffer, 0, 510);
 #else
     buffer = (S8 *)calloc(1, 510); 
 #endif
@@ -5979,7 +5947,7 @@ Void      *arg;
     (void) cmAddrToSymStr((void *)pc, buffer, 505);
     bt->bt_buffer[bt->bt_actcount++] = (S8 *)buffer;
 
-    RETVALUE(0);
+    return (0);
 } /* cmLeakCallBack */
 #endif /* SS_MEM_LEAK_SOL */
 
@@ -6005,24 +5973,24 @@ Void      *arg;
 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
 #ifdef ANSI
-PUBLIC S16 cmMmRegIsBlkSane
+S16 cmMmRegIsBlkSane
 (
 CmMmBlkHdr *blkPtr,
 Size       size
 )
 #else
-PUBLIC S16 cmMmRegIsBlkSane(blkPtr, size)
+S16 cmMmRegIsBlkSane(blkPtr, size)
 CmMmBlkHdr *blkPtr;
 Size       size;
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 cmMmRegIsBlkSane
+S16 cmMmRegIsBlkSane
 (
 CmMmBlkHdr *blkPtr
 )
 #else
-PUBLIC S16 cmMmRegIsBlkSane(blkPtr)
+S16 cmMmRegIsBlkSane(blkPtr)
 CmMmBlkHdr *blkPtr;
 #endif
 #endif
@@ -6031,13 +5999,12 @@ CmMmBlkHdr *blkPtr;
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
    CmMmBlkTail  *tailPtr;
 #endif
-   TRC2(cmMmRegIsBlkSane);
 
    for ( sigCnt=0; sigCnt < CMM_TRAMPLING_SIGNATURE_LEN; sigCnt++)
    {
       if (blkPtr->trSignature[sigCnt] != 0xAB)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
@@ -6046,11 +6013,11 @@ CmMmBlkHdr *blkPtr;
    {
       if (tailPtr->trSignature[sigCnt] != 0xFE)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 #endif
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 #ifdef SSI_DEBUG_LEVEL1
@@ -6087,8 +6054,6 @@ CmMmBkt  *bkt;
    CmMmBlkHdr *ptrBlk;
    U32 blkCnt;
 
-   TRC2(cmMmBktSanityChk);
-
    bkt->trampleCount = 0;
 
    /* scan the entire memory list of the bucket */
@@ -6101,7 +6066,7 @@ CmMmBkt  *bkt;
          if (bkt->trampleCount > CMM_TRAMPLING_THRESHOLD)
          {
             /* Take action to invalidate the entire bucket */
-            RETVALUE(RTRAMPLINGNOK);
+            return (RTRAMPLINGNOK);
          }
       }
       /* reach next memory block in this bucket manually */
@@ -6114,7 +6079,7 @@ CmMmBkt  *bkt;
    SDisplay(0, dbgPrntBuf);
  #endif /* DEBUGP */
 
-   RETVALUE(RTRAMPLINGOK);
+   return (RTRAMPLINGOK);
 }
 
 /*
@@ -6147,17 +6112,16 @@ CmMmHeapCb  *heapCb;
 #endif
 {
 
-   TRC2(cmMmHeapSanityChk);
 
    /* increment the trample count */
    heapCb->trampleCount++;
 
    if (heapCb->trampleCount > CMM_TRAMPLING_THRESHOLD)
    {
-      RETVALUE(RTRAMPLINGNOK);
+      return (RTRAMPLINGNOK);
    }
 
-   RETVALUE(RTRAMPLINGOK);
+   return (RTRAMPLINGOK);
 }
 /*
 *
@@ -6189,11 +6153,10 @@ U32 key; /* key string */
 U16 *idx; /* idx to return */
 #endif
 {
-   TRC2(cmMmHashFunc);
 
    *idx = (U16)(key % hashListCp->numOfbins);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmMmHashFunc () */
 
@@ -6237,7 +6200,6 @@ Pool         pool;         /* memory pool to allocate bins */
    U16 i;
    CmMmHashListEnt *hl;
 
-   TRC2(cmMmHashListInit);
 
    /* initialize control point fields */
    hashListCp->hashList = NULLP;
@@ -6249,7 +6211,7 @@ Pool         pool;         /* memory pool to allocate bins */
    {
       if (SGetSBuf(region, pool, (Data **) &hashListCp->hashList,
                (Size)(nmbBins * sizeof(CmMmHashListEnt))) != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
       /* initialize bin pointers */
       hl = hashListCp->hashList;
@@ -6262,7 +6224,7 @@ Pool         pool;         /* memory pool to allocate bins */
       hashListCp->numOfbins = nmbBins;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -6298,7 +6260,6 @@ Region       region;       /* memory region to allocate bins */
 Pool         pool;         /* memory pool to allocate bins */
 #endif
 {
-   TRC2(cmMmHashListDeinit);
 
    /* deallocate memory for bins */
    if (hashListCp->numOfbins)
@@ -6311,7 +6272,7 @@ Pool         pool;         /* memory pool to allocate bins */
    hashListCp->numOfbins = 0;
    hashListCp->numOfEntries = 0;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmMmHashListDeinit */
 
 /*
@@ -6347,15 +6308,14 @@ U32           key;         /* pointer to key */
    U16 idx;                       /* index for insertion into hash list */
    U16 i;
 
-   TRC2(cmMmHashListInsert);
 
    /* check if hashListCp is initialised yet */
    if ( hashListCp->numOfbins == 0)
-      RETVALUE(ROK);
+      return ROK;
 
    /* compute index for insertion */
    if (cmMmHashFunc(hashListCp, key, &idx) != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
    hashListEnt = hashListCp->hashList;
 
@@ -6391,11 +6351,11 @@ U32           key;         /* pointer to key */
    if (i == CMM_STAT_HASH_TBL_LEN)
    {
       /* there is no free slot for this key */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmMmHashListInsert */
 
 #endif /* SSI_DEBUG_LEVEL1 */
@@ -6427,7 +6387,6 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
 #endif
 {
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmHstGrmHashListInit)
 #ifdef  DEBUGP
    /* display an error message here */
    /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ 
@@ -6439,7 +6398,7 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
     SDisplay(0, dbgPrntBuf);
 #endif /* DEBUGP */
     memset(hashListCp, 0, sizeof(CmHstGrmHashListCp));
-    RETVALUE(ROK);
+    return ROK;
 }
 
 /*
@@ -6468,7 +6427,6 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
 #endif
 {
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmHstGrmHashListDeInit)
 #ifdef  DEBUGP
    /* display an error message here */
    /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ 
@@ -6480,7 +6438,7 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
     SDisplay(0, dbgPrntBuf);
 #endif /* DEBUGP */
     memset(hashListCp, 0, sizeof(CmHstGrmHashListCp));
-    RETVALUE(ROK);
+    return ROK;
 }
 
 /*
@@ -6526,7 +6484,6 @@ U8        entId; /* Tapa task which frees the memory */
    CmMemEntries           *entry = NULLP; /* Entry which contains the information */
 
 
-   TRC2(cmHstGrmFreeInsert);
 
    /* check for the total number of entries in the hash list. *
     * If there is no place for new entry return failure */
@@ -6539,14 +6496,14 @@ U8        entId; /* Tapa task which frees the memory */
    {
 		entry->freedBytes += blkSz;
       entry->bucketFreeReq++;
-      RETVALUE(ROK);
+      return ROK;
    } /* End of if */
 
    /* If hash list is full then print the error tna continue */
    if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN))
    {
         printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN \n");
-        RETVALUE(RFAILED);
+        return RFAILED;
    } /* End of if */
 
    /* Take the address of next free entry in the hash bin */
@@ -6564,7 +6521,7 @@ U8        entId; /* Tapa task which frees the memory */
    /* Increase the total number of entries in the hash list */
    hashListCp->totalNumEntries++;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmHstGrmFreeInsert */
 
 
@@ -6610,7 +6567,6 @@ U8        entId;
    U32                    ret = 0;
    CmMemEntries           *entry = NULLP;
 
-   TRC2(cmHstGrmAllocInsert);
 
    /* check for the total number of entries in the hash list. *
     * If there is no place for new entry return failure */
@@ -6625,13 +6581,13 @@ U8        entId;
 	   entry->allocBytes += blkSz;
       entry->bucketAllocReq++;
       entry->wastedBytes += (blkSz - *reqSz);
-      RETVALUE(ROK);
+      return ROK;
    } /* End of if */
 
    if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN))
    {
         printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN\n");
-        RETVALUE(RFAILED);
+        return RFAILED;
    } /* End of if */
 
    /* Take the address of next free entry in the hash bin */
@@ -6652,7 +6608,7 @@ U8        entId;
    /* Increase the total number of entries in the hash list */
    hashListCp->totalNumEntries++;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmHstGrmAllocInsert */
 
 
@@ -6691,7 +6647,6 @@ U32                *key;
 {
 
    U32  i = 0;
-   TRC2(cmHstGrmGetHashIdxAndKey);
 
    /* Calculate the key using file name and line number */
    for(i = 0 ; fileName[i] != '\0'; i++)
@@ -6700,7 +6655,7 @@ U32                *key;
    }/* End of for */
        *key += line;
    *binIdx = ( *key % CMM_HIST_MAX_MEM_BIN);
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmHstGrmFillEntry */
 
 /*
@@ -6743,7 +6698,6 @@ U8                 entId;
 {
 
    U32       idx = 0;
-   TRC2(cmHstGrmFillEntry);
    entry->key = key;
    entry->line = line;
    entry->entId = entId;
@@ -6752,7 +6706,7 @@ U8                 entId;
       entry->fileName[idx] = fileName[idx];
    }
    entry->fileName[idx] = '\0';
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmHstGrmFillEntry */
 
 /*
@@ -6793,9 +6747,6 @@ CmMemEntries        **entry;
    U32                  numBin = 0;
    CmHstGrmHashListEnt  *tmpBin = NULLP;
 
-   TRC2(cmHstGrmFindEntry);
-
-
    for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++)
    {
       /* find for the entry in the bin */
@@ -6807,7 +6758,7 @@ CmMemEntries        **entry;
          if(tmpBin->entries[numEnt].key == key)
          {
             *entry = &(tmpBin->entries[numEnt]);
-            RETVALUE(ROK);
+            return ROK;
          }/* End of if (tmpBin->entries[numEnt].key) */
       }/* end of for (numEnt = 0) */
 
@@ -6830,12 +6781,12 @@ CmMemEntries        **entry;
       else
       {
          printf ("Unable to find the entry in hash list\n");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }/* End of else (numEnt) */
    }/* end of for (numBin = 0) */
 
    printf("Unable to find the entry in the hash list\n");
-   RETVALUE(RFAILED);
+   return RFAILED;
 } /* end of cmHstGrmFindEntry */
 
 #endif /* SS_HISTOGRAM_SUPPORT */