X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_gen.c;h=a1f88bb6315fcd876e505038fec5c99ce38c9ddb;hb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;hp=b94ccb6ed270dd6381cff6adc5c3d12f90e11df3;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c
index b94ccb6ed..a1f88bb63 100644
--- a/src/cm/cm_gen.c
+++ b/src/cm/cm_gen.c
@@ -98,18 +98,17 @@ U16 gTransId = 0;
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkDateTime
+S16 cmPkDateTime
 (
 DateTime *dateTime,       /* date and time */
 Buffer *mBuf              /* message buffer */
 )
 #else
-PUBLIC S16 cmPkDateTime(dateTime, mBuf)
+S16 cmPkDateTime(dateTime, mBuf)
 DateTime *dateTime;       /* date and time */
 Buffer *mBuf;             /* message buffer */
 #endif
 {
-   TRC2(cmPkDateTime)
 
    /*-- cm_gen_c_001.main_36 - added for micro seconds --*/
 #ifdef SS_DATETIME_USEC
@@ -142,18 +141,17 @@ Buffer *mBuf;             /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkDuration
+S16 cmPkDuration
 (
 Duration *duration,        /* duration */
 Buffer   *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmPkDuration(duration, mBuf)
+S16 cmPkDuration(duration, mBuf)
 Duration *duration;        /* duration */
 Buffer   *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmPkDuration)
 
    CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf);
    CMCHKPK(oduUnpackUInt8, duration->secs,   mBuf);
@@ -179,13 +177,13 @@ Buffer   *mBuf;            /* message buffer */
 */
  
 #ifdef ANSI
-PUBLIC S16 oduPackPointer
+S16 oduPackPointer
 (
 PTR      ptr,              /* pointer */
 Buffer   *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 oduPackPointer(ptr, mBuf)
+S16 oduPackPointer(ptr, mBuf)
 PTR      ptr;              /* pointer */
 Buffer   *mBuf;            /* message buffer */
 #endif
@@ -198,7 +196,6 @@ Buffer   *mBuf;            /* message buffer */
    U32 tmp32;
 #endif
 
-   TRC2(oduPackPointer)
    
    ret = ROK;
    switch (PTRSIZE)
@@ -293,18 +290,17 @@ Buffer   *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkEntityId
+S16 cmPkEntityId
 (
 EntityId *entityId,        /* entity id */
 Buffer   *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmPkEntityId(entityId, mBuf)
+S16 cmPkEntityId(entityId, mBuf)
 EntityId *entityId;        /* entity id */
 Buffer   *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmPkEntityId)
 
    CMCHKPK(cmPkInst, entityId->inst, mBuf);
    CMCHKPK(cmPkEnt, entityId->ent, mBuf);
@@ -328,18 +324,17 @@ Buffer   *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkElmntId
+S16 cmPkElmntId
 (
 ElmntId *elmntId,         /* element id */
 Buffer  *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmPkElmntId(elmntId, mBuf)
+S16 cmPkElmntId(elmntId, mBuf)
 ElmntId *elmntId;         /* element id */
 Buffer  *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmPkElmntId)
 
    CMCHKPK(cmPkElmntInst3, elmntId->elmntInst3, mBuf); 
    CMCHKPK(cmPkElmntInst2, elmntId->elmntInst2, mBuf); 
@@ -365,18 +360,17 @@ Buffer  *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkMemoryId
+S16 cmPkMemoryId
 (
 MemoryId *memoryId,        /* memoryId */
 Buffer   *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmPkMemoryId(memoryId, mBuf)
+S16 cmPkMemoryId(memoryId, mBuf)
 MemoryId *memoryId;        /* memoryId */
 Buffer   *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmPkMemoryId)
 
    CMCHKPK(cmPkPool, memoryId->pool, mBuf); 
    CMCHKPK(cmPkRegion, memoryId->region, mBuf);
@@ -400,20 +394,19 @@ Buffer   *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkSystemId
+S16 cmPkSystemId
 (
 SystemId *systemId,         /* system id */
 Buffer   *mBuf              /* message buffer */
 )
 #else
-PUBLIC S16 cmPkSystemId(systemId, mBuf)
+S16 cmPkSystemId(systemId, mBuf)
 SystemId *systemId;         /* system id */
 Buffer   *mBuf;             /* message buffer */
 #endif
 {
    Txt *p;                  /* part number string */
 
-   TRC2(cmPkSystemId)
 
    for (p = systemId->ptNmb; *p; p++);
 
@@ -449,20 +442,19 @@ Buffer   *mBuf;             /* message buffer */
  */
 
 #ifdef ANSI
-PUBLIC S16 cmPkProtAddr
+S16 cmPkProtAddr
 (
 ProtAddr     *pAddr,     /* protocol address */
 Buffer       *mBuf       /* buffer */
 )
 #else
-PUBLIC S16 cmPkProtAddr(pAddr, mBuf)
+S16 cmPkProtAddr(pAddr, mBuf)
 ProtAddr     *pAddr;      /* protocol address */
 Buffer       *mBuf;          /* buffer */
 #endif
 {
    U8              j;                  /* Index */
 
-   TRC3(cmPkProtAddr)
 
 #ifdef CM_ARI2
    CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf);  
@@ -498,13 +490,13 @@ Buffer       *mBuf;          /* buffer */
  */
 
 #ifdef ANSI
-PUBLIC S16 cmPkProtAddrTbl
+S16 cmPkProtAddrTbl
 (
 ProtAddrTbl  *protAddr,      /* protocol address table */
 Buffer       *mBuf          /* buffer */
 )
 #else
-PUBLIC S16 cmPkProtAddrTbl(protAddr, mBuf)
+S16 cmPkProtAddrTbl(protAddr, mBuf)
 ProtAddrTbl  *protAddr;      /* protocol address table */
 Buffer       *mBuf;          /* buffer */
 #endif
@@ -513,7 +505,6 @@ Buffer       *mBuf;          /* buffer */
    U8              j;                  /* Index */
    ProtAddr        *pAddr;             /* protocol Address */
 
-   TRC3(cmPkProtAddrTbl)
 
    if (protAddr->count > MAX_PROT_ADDRS)
       return RFAILED;
@@ -557,20 +548,19 @@ Buffer       *mBuf;          /* buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkAddrs
+S16 cmPkAddrs
 (
 Addrs *addrs,           /* address */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmPkAddrs(addrs, mBuf)
+S16 cmPkAddrs(addrs, mBuf)
 Addrs *addrs;           /* address */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
    U8 i;                /* loop counter */
 
-   TRC2(cmPkAddrs)
 
    if (addrs->length > ADRLEN)
       return RFAILED;
@@ -602,20 +592,19 @@ Buffer *mBuf;           /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkShrtAddrs
+S16 cmPkShrtAddrs
 (
 ShrtAddrs *addrs,          /* address */
 Buffer    *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmPkShrtAddrs(addrs, mBuf)
+S16 cmPkShrtAddrs(addrs, mBuf)
 ShrtAddrs *addrs;          /* address */
 Buffer    *mBuf;           /* message buffer */
 #endif 
 {
    U8 i;                /* loop counter */
 
-   TRC2(cmPkShrtAddrs)
 
    if (addrs->length > SHRTADRLEN)
       return RFAILED;
@@ -646,20 +635,19 @@ Buffer    *mBuf;           /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkAddrMask
+S16 cmPkAddrMask
 (
 U8 *mask,             /* pointer to address mask array */
 Buffer  *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmPkAddrMask(mask, mBuf)
+S16 cmPkAddrMask(mask, mBuf)
 U8 *mask;             /* pointer to address mask array */
 Buffer  *mBuf;        /* message buffer */
 #endif
 {
    S16 i;             /* counter */
 
-   TRC2(cmPkAddrMask)
 
    /* pack address mask */
    for (i = (ADRLEN - 1); i >= 0; i--)
@@ -686,20 +674,19 @@ Buffer  *mBuf;        /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkBndCfg
+S16 cmPkBndCfg
 (
 BndCfg *bndCfg,         /* bndCfg */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmPkBndCfg(bndCfg, mBuf)
+S16 cmPkBndCfg(bndCfg, mBuf)
 BndCfg *bndCfg;         /* bndCfg */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
    Txt *p;              /* temporary */
 
-   TRC2(cmPkBndCfg)
 
    CMCHKPK(cmPkSelector, bndCfg->selector, mBuf);
    CMCHKPK(cmPkAddrs, &bndCfg->sapAdr, mBuf);
@@ -735,18 +722,17 @@ Buffer *mBuf;           /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkPst
+S16 cmPkPst
 (
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkPst(pst, mBuf)
+S16 cmPkPst(pst, mBuf)
 Pst *pst;
 Buffer *mBuf;
 #endif
 {
-   TRC2(cmPkPst)
    
    CMCHKPK(cmPkEvent, pst->event, mBuf);
    CMCHKPK(cmPkInst, pst->srcInst, mBuf);
@@ -782,18 +768,17 @@ Buffer *mBuf;
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkElmtHdr
+S16 cmPkElmtHdr
 (
 ElmtHdr *m,                  /* element header */
 Buffer  *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkElmtHdr(m, mBuf)
+S16 cmPkElmtHdr(m, mBuf)
 ElmtHdr *m;                  /* element header */
 Buffer  *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkElmtHdr)
  
 #if (LCAMT || ATM_BISUP)
       CMCHKPK(oduUnpackUInt16, m->compInd, mBuf);
@@ -829,18 +814,17 @@ Buffer  *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknU8
+S16 cmPkTknU8
 (
 TknU8  *tknU8,              /* token U8 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknU8(tknU8, mBuf)
+S16 cmPkTknU8(tknU8, mBuf)
 TknU8  *tknU8;              /* token U8 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknU8)
 
    if (tknU8->pres)
    {
@@ -870,18 +854,17 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknS8
+S16 cmPkTknS8
 (
 TknS8  *tknS8,              /* token S8 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknS8(tknS8, mBuf)
+S16 cmPkTknS8(tknS8, mBuf)
 TknS8  *tknS8;              /* token S8 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknS8)
  
    if (tknS8->pres)
    {
@@ -911,18 +894,17 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknU16
+S16 cmPkTknU16
 (
 TknU16 *tknU16,             /* token U16 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknU16(tknU16, mBuf)
+S16 cmPkTknU16(tknU16, mBuf)
 TknU16 *tknU16;             /* token U16 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknU16)
 
    if (tknU16->pres)
    {
@@ -952,18 +934,17 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknU32
+S16 cmPkTknU32
 (
 TknU32 *tknU32,             /* token U32 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknU32(tknU32, mBuf)
+S16 cmPkTknU32(tknU32, mBuf)
 TknU32 *tknU32;             /* token U32 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknU32)
 
    if (tknU32->pres)
    {
@@ -993,20 +974,19 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr
+S16 cmPkTknStr
 (
 TknStr *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr(tknStr, mBuf)
+S16 cmPkTknStr(tknStr, mBuf)
 TknStr *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                    /* counter */
 
-   TRC2(cmPkTknStr)
 
    if (tknStr->pres)
    {
@@ -1042,20 +1022,19 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrM
+S16 cmPkTknStrM
 (
 TknStrM *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrM(tknStr, mBuf)
+S16 cmPkTknStrM(tknStr, mBuf)
 TknStrM *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                    /* counter */
 
-   TRC2(cmPkTknStrM)
 
    if(tknStr->pres)
    {
@@ -1091,20 +1070,19 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrS
+S16 cmPkTknStrS
 (
 TknStrS *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrS(tknStr, mBuf)
+S16 cmPkTknStrS(tknStr, mBuf)
 TknStrS *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                    /* counter */
 
-   TRC2(cmPkTknStrS)
 
    if(tknStr->pres)
    {
@@ -1140,20 +1118,19 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrE
+S16 cmPkTknStrE
 (
 TknStrE *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrE(tknStr, mBuf)
+S16 cmPkTknStrE(tknStr, mBuf)
 TknStrE *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                    /* counter */
 
-   TRC2(cmPkTknStrE)
 
    if(tknStr->pres)
    {
@@ -1191,20 +1168,19 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkPnNodeId
+S16 cmPkPnNodeId
 (
 PnNodeId  *src,     /* source PNNI Node Id */
 Buffer *mBuf        /* message buffer */
 )
 #else
-PUBLIC S16 cmPkPnNodeId (src, mBuf)
+S16 cmPkPnNodeId (src, mBuf)
 PnNodeId  *src;     /* source PNNI Node Id */
 Buffer *mBuf;       /* message buffer */
 #endif
 {
    S16 i;
    
-   TRC3(cmPkPnNodeId);
    
    for (i = PN_NODEID_LEN - 1; i >= 0; i--)
    {
@@ -1232,18 +1208,17 @@ Buffer *mBuf;       /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr4
+S16 cmPkTknStr4
 (
 TknStr4 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr4(tknStr, mBuf)
+S16 cmPkTknStr4(tknStr, mBuf)
 TknStr4 *tknStr;             /* token string */
 Buffer  *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr4)
 
    CMPKTKNSTR(tknStr, mBuf);
 
@@ -1268,18 +1243,17 @@ Buffer  *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr12
+S16 cmPkTknStr12
 (
 TknStr12 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr12(tknStr, mBuf)
+S16 cmPkTknStr12(tknStr, mBuf)
 TknStr12 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr12)
 
    CMPKTKNSTR(tknStr, mBuf);
 
@@ -1303,18 +1277,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr32
+S16 cmPkTknStr32
 (
 TknStr32 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr32(tknStr, mBuf)
+S16 cmPkTknStr32(tknStr, mBuf)
 TknStr32 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr32)
 
    CMPKTKNSTR(tknStr, mBuf);
 
@@ -1338,18 +1311,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr64
+S16 cmPkTknStr64
 (
 TknStr64 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr64(tknStr, mBuf)
+S16 cmPkTknStr64(tknStr, mBuf)
 TknStr64 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr64)
 
    CMPKTKNSTR(tknStr, mBuf);
 
@@ -1373,18 +1345,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr132
+S16 cmPkTknStr132
 (
 TknStr132 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr132(tknStr, mBuf)
+S16 cmPkTknStr132(tknStr, mBuf)
 TknStr132 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr132)
 
    CMPKTKNSTR(tknStr, mBuf);
 
@@ -1408,18 +1379,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr256
+S16 cmPkTknStr256
 (
 TknStr256 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr256(tknStr, mBuf)
+S16 cmPkTknStr256(tknStr, mBuf)
 TknStr256 *tknStr;             /* token string */
 Buffer    *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr256)
 
    CMPKTKNSTR(tknStr, mBuf);
 
@@ -1443,20 +1413,19 @@ Buffer    *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknOid
+S16 cmPkTknOid
 (
 TknOid   *tknOid,             /* Object Identifier token */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknOid(tknOid, mBuf)
+S16 cmPkTknOid(tknOid, mBuf)
 TknOid   *tknOid;             /* Object Identifier token */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
    U16    i;
 
-   TRC2(cmPkTknOid)
  
    if (tknOid->pres == TRUE)
    {
@@ -1496,18 +1465,17 @@ Buffer   *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknS32
+S16 cmPkTknS32
 (
 TknS32 *tknS32,             /* token S32 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknS32(tknS32, mBuf)
+S16 cmPkTknS32(tknS32, mBuf)
 TknS32 *tknS32;             /* token S32 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknS32)
 
    if (tknS32->pres)
    {
@@ -1537,18 +1505,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkHeader
+S16 cmPkHeader
 (
 Header *header,             /* header */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkHeader(header, mBuf)
+S16 cmPkHeader(header, mBuf)
 Header *header;             /* header */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkHeader)
 
 #ifdef LMINT3
    CMCHKPK(cmPkMemoryId, &header->response.mem, mBuf);
@@ -1583,18 +1550,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkCmStatus
+S16 cmPkCmStatus
 (
 CmStatus *sta,              /* status structure */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmStatus(sta, mBuf)
+S16 cmPkCmStatus(sta, mBuf)
 CmStatus *sta;              /* status structure */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkCmStatus)
 
    CMCHKPK(oduUnpackUInt16, sta->reason, mBuf);
    CMCHKPK(oduUnpackUInt16, sta->status, mBuf);
@@ -1618,18 +1584,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkCmAlarm
+S16 cmPkCmAlarm
 (
 CmAlarm *alarm,            /* alarm structure */
 Buffer  *mBuf              /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmAlarm(alarm, mBuf)
+S16 cmPkCmAlarm(alarm, mBuf)
 CmAlarm *alarm;             /* alarm structure */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkCmAlarm)
 
    CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf);
    CMCHKPK(oduUnpackUInt16, alarm->event, mBuf);
@@ -1655,18 +1620,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkSmCfg
+S16 cmPkSmCfg
 (
 SmCfg *smCfg,           /* stack manager */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmPkSmCfg(smCfg, mBuf)
+S16 cmPkSmCfg(smCfg, mBuf)
 SmCfg *smCfg;           /* stack manager */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
-   TRC2(cmPkSmCfg)
 
    CMCHKPK(cmPkSelector, smCfg->selector, mBuf); 
    CMCHKPK(cmPkRoute, smCfg->route, mBuf); 
@@ -1695,18 +1659,17 @@ Buffer *mBuf;           /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTmrCfg
+S16 cmPkTmrCfg
 (
 TmrCfg *tmrCfg,         /* timer configuration */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTmrCfg(tmrCfg, mBuf)
+S16 cmPkTmrCfg(tmrCfg, mBuf)
 TmrCfg *tmrCfg;         /* timer configuration */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
-   TRC2(cmPkTmrCfg)
 
    CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf);
    CMCHKPK(oduPackBool, tmrCfg->enb, mBuf);
@@ -1730,18 +1693,17 @@ Buffer *mBuf;           /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknBuf
+S16 cmPkTknBuf
 (
 TknBuf *tknBuf,                /* token string */
 Buffer    *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknBuf(tknBuf, mBuf)
+S16 cmPkTknBuf(tknBuf, mBuf)
 TknBuf *tknBuf;                /* token string */
 Buffer    *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknBuf)
 
    if(tknBuf->pres)
    {
@@ -1778,18 +1740,17 @@ Buffer    *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmPkIntf
+S16 cmPkIntf
 (
 CmIntf *intf,           /* interface info */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmPkIntf(intf, mBuf)
+S16 cmPkIntf(intf, mBuf)
 CmIntf *intf;           /* interface info */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
-   TRC2(cmPkIntf)
 
    CMCHKPK(cmPkIntfId,  intf->intfId,  mBuf); 
    CMCHKPK(cmPkIntfVer, intf->intfVer, mBuf); 
@@ -1819,18 +1780,17 @@ Buffer *mBuf;           /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkDateTime
+S16 cmUnpkDateTime
 (
 DateTime *dateTime,  /* date/time structure */
 Buffer *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkDateTime(dateTime, mBuf)
+S16 cmUnpkDateTime(dateTime, mBuf)
 DateTime *dateTime;  /* date/time structure */
 Buffer *mBuf;        /* message buffer */
 #endif
 {
-   TRC2(cmUnpDateTime)
 
    CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); 
    CMCHKUNPK(oduPackUInt8, &dateTime->day, mBuf); 
@@ -1864,18 +1824,17 @@ Buffer *mBuf;        /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkDuration
+S16 cmUnpkDuration
 (
 Duration *duration,  /* duration structure */
 Buffer *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkDuration(duration, mBuf)
+S16 cmUnpkDuration(duration, mBuf)
 Duration *duration;  /* duration structure */
 Buffer *mBuf;        /* message buffer */
 #endif
 {
-   TRC2(cmUnpDuration)
 
    CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); 
    CMCHKUNPK(oduPackUInt8, &duration->hours, mBuf); 
@@ -1901,13 +1860,13 @@ Buffer *mBuf;        /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 oduUnpackPointer
+S16 oduUnpackPointer
 (
 PTR *ptr,  /* duration structure */
 Buffer *mBuf    /* message buffer */
 )
 #else
-PUBLIC S16 oduUnpackPointer(ptr, mBuf)
+S16 oduUnpackPointer(ptr, mBuf)
 PTR *ptr;  /* duration structure */
 Buffer *mBuf;   /* message buffer */
 #endif
@@ -1921,7 +1880,6 @@ Buffer *mBuf;   /* message buffer */
    U64 tmp64;
 #endif
    
-   TRC2(oduUnpackPointer)
 
    switch (PTRSIZE)
    {
@@ -2033,18 +1991,17 @@ Buffer *mBuf;   /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkEntityId
+S16 cmUnpkEntityId
 (
 EntityId *entityId,        /* entity id */
 Buffer   *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkEntityId(entityId, mBuf)
+S16 cmUnpkEntityId(entityId, mBuf)
 EntityId *entityId;        /* entity id */
 Buffer   *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmUnpkEntityId)
 
    CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); 
    CMCHKUNPK(cmUnpkInst, &entityId->inst, mBuf);
@@ -2068,18 +2025,17 @@ Buffer   *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkElmntId
+S16 cmUnpkElmntId
 (
 ElmntId *elmntId,         /* element id */
 Buffer  *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkElmntId(elmntId, mBuf)
+S16 cmUnpkElmntId(elmntId, mBuf)
 ElmntId *elmntId;         /* element id */
 Buffer  *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmUnpkElmntId)
 
    CMCHKUNPK(cmUnpkElmnt, &elmntId->elmnt, mBuf); 
    CMCHKUNPK(cmUnpkElmntInst1, &elmntId->elmntInst1, mBuf); 
@@ -2105,18 +2061,17 @@ Buffer  *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkMemoryId
+S16 cmUnpkMemoryId
 (
 MemoryId *memoryId,        /* memoryId */
 Buffer   *mBuf             /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkMemoryId(memoryId, mBuf)
+S16 cmUnpkMemoryId(memoryId, mBuf)
 MemoryId *memoryId;        /* memoryId */
 Buffer   *mBuf;            /* message buffer */
 #endif
 {
-   TRC2(cmUnpkMemoryId)
 
    CMCHKUNPK(cmUnpkRegion, &memoryId->region,   mBuf); 
    CMCHKUNPK(cmUnpkPool, &memoryId->pool, mBuf);
@@ -2140,13 +2095,13 @@ Buffer   *mBuf;            /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkSystemId
+S16 cmUnpkSystemId
 (
 SystemId *systemId,         /* system id */
 Buffer   *mBuf              /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkSystemId(systemId, mBuf)
+S16 cmUnpkSystemId(systemId, mBuf)
 SystemId *systemId;         /* system id */
 Buffer   *mBuf;             /* message buffer */
 #endif
@@ -2154,7 +2109,6 @@ Buffer   *mBuf;             /* message buffer */
    S16 i;               /* loop counter */
    MsgLen len;
    
-   TRC2(cmUnpkSystemId)
 
    CMCHKUNPK(SUnpkS16, &systemId->mVer, mBuf); 
    CMCHKUNPK(SUnpkS16, &systemId->mRev, mBuf); 
@@ -2189,20 +2143,19 @@ Buffer   *mBuf;             /* message buffer */
  */
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkProtAddr
+S16 cmUnpkProtAddr
 (
 ProtAddr     *pAddr,         /* protocol address */
 Buffer       *mBuf           /* buffer */
 )
 #else
-PUBLIC S16 cmUnpkProtAddr(pAddr, mBuf)
+S16 cmUnpkProtAddr(pAddr, mBuf)
 ProtAddr     *pAddr;         /* protocol address table */
 Buffer       *mBuf;          /* buffer */
 #endif
 {
    U8               j;                  /* Index */
 
-   TRC3(cmUnpkProtAddr)
 
    CMCHKUNPK(oduPackUInt16,  &(pAddr->protType), mBuf);  
    CMCHKUNPK(oduPackUInt8,   &(pAddr->len), mBuf);  
@@ -2236,13 +2189,13 @@ Buffer       *mBuf;          /* buffer */
  */
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkProtAddrTbl
+S16 cmUnpkProtAddrTbl
 (
 ProtAddrTbl  *protAddr,      /* protocol address table */
 Buffer       *mBuf           /* buffer */
 )
 #else
-PUBLIC S16 cmUnpkProtAddrTbl(protAddr, mBuf)
+S16 cmUnpkProtAddrTbl(protAddr, mBuf)
 ProtAddrTbl  *protAddr;      /* protocol address table */
 Buffer       *mBuf;          /* buffer */
 #endif
@@ -2251,7 +2204,6 @@ Buffer       *mBuf;          /* buffer */
    U8               j;                  /* Index */
    ProtAddr         *pAddr;             /* Protocol Address */
 
-   TRC3(cmUnpkProtAddrTbl)
 
    CMCHKUNPK(oduPackUInt8, &protAddr->count, mBuf);  
    for (i = 0;  i < protAddr->count; i++)
@@ -2290,20 +2242,19 @@ Buffer       *mBuf;          /* buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkAddrs
+S16 cmUnpkAddrs
 (
 Addrs *addrs,     /* address */
 Buffer *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkAddrs(addrs, mBuf)
+S16 cmUnpkAddrs(addrs, mBuf)
 Addrs *addrs;     /* address */
 Buffer *mBuf;     /* message buffer */
 #endif
 {
    U8 i;          /* loop counter */
 
-   TRC2(cmUnpAddrs)
 
    CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf);
 
@@ -2333,20 +2284,19 @@ Buffer *mBuf;     /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkShrtAddrs
+S16 cmUnpkShrtAddrs
 (
 ShrtAddrs *addrs,    /* address */
 Buffer    *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkShrtAddrs(addrs, mBuf)
+S16 cmUnpkShrtAddrs(addrs, mBuf)
 ShrtAddrs *addrs;    /* address */
 Buffer    *mBuf;     /* message buffer */
 #endif
 {
    U8 i;          /* loop counter */
 
-   TRC2(cmUnpShrtAddrs)
 
    CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf);
 
@@ -2376,20 +2326,19 @@ Buffer    *mBuf;     /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkAddrMask
+S16 cmUnpkAddrMask
 (
 U8 *mask,             /* pointer to address mask */
 Buffer  *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkAddrMask(mask, mBuf)
+S16 cmUnpkAddrMask(mask, mBuf)
 U8 *mask;             /* pointer to address mask */
 Buffer  *mBuf;        /* message buffer */
 #endif
 {
    S16 i;             /* counter */
 
-   TRC2(cmUnpAddrMask)
 
    /* unpack address mask */
    for (i = 0; i< ADRLEN; i++) 
@@ -2415,20 +2364,19 @@ Buffer  *mBuf;        /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkBndCfg
+S16 cmUnpkBndCfg
 (
 BndCfg *bndCfg,         /* bndCfg */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkBndCfg(bndCfg, mBuf)
+S16 cmUnpkBndCfg(bndCfg, mBuf)
 BndCfg *bndCfg;         /* bndCfg */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
    S16 i;               /* loop counter */
 
-   TRC2(cmUnpBndCfg)
 
    for (i = 0; bndCfg->usrId[i]; i++);
    CMCHKUNPK(cmUnpkTxt, bndCfg->usrId+i, mBuf);
@@ -2463,18 +2411,17 @@ Buffer *mBuf;           /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkPst
+S16 cmUnpkPst
 (
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPst(pst, mBuf)
+S16 cmUnpkPst(pst, mBuf)
 Pst *pst;
 Buffer *mBuf;
 #endif
 {
-   TRC2(cmUnpkPst)
 
 #ifdef TDS_ROLL_UPGRADE_SUPPORT
    CMCHKUNPK(cmUnpkIntfVer, &pst->intfVer, mBuf);
@@ -2510,18 +2457,17 @@ Buffer *mBuf;
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkElmtHdr
+S16 cmUnpkElmtHdr
 (
 ElmtHdr *m,                  /* element header */
 Buffer  *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkElmtHdr(m, mBuf)
+S16 cmUnpkElmtHdr(m, mBuf)
 ElmtHdr *m;                  /* element header */
 Buffer  *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpElmtHdr)
  
    /* Present */
    CMCHKUNPK(oduUnpackBool, &m->pres , mBuf);
@@ -2557,18 +2503,17 @@ Buffer  *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknU8
+S16 cmUnpkTknU8
 (
 TknU8 *tknU8,               /* token U8 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknU8(tknU8, mBuf)
+S16 cmUnpkTknU8(tknU8, mBuf)
 TknU8 *tknU8;               /* token U8 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpTknU8)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknU8->pres, mBuf);
@@ -2598,18 +2543,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknS8
+S16 cmUnpkTknS8
 (
 TknS8 *tknS8,               /* token S8 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknS8(tknS8, mBuf)
+S16 cmUnpkTknS8(tknS8, mBuf)
 TknS8 *tknS8;               /* token S8 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpTknS8)
  
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknS8->pres, mBuf);
@@ -2639,18 +2583,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknU16
+S16 cmUnpkTknU16
 (
 TknU16 *tknU16,             /* token U16 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknU16(tknU16, mBuf)
+S16 cmUnpkTknU16(tknU16, mBuf)
 TknU16 *tknU16;             /* token U16 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpTknU16)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknU16->pres, mBuf);
@@ -2680,18 +2623,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknU32
+S16 cmUnpkTknU32
 (
 TknU32 *tknU32,             /* token U32 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknU32(tknU32, mBuf)
+S16 cmUnpkTknU32(tknU32, mBuf)
 TknU32 *tknU32;             /* token U32 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpTknU32)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknU32->pres, mBuf);
@@ -2720,20 +2662,19 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr
+S16 cmUnpkTknStr
 (
 TknStr *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr(tknStr, mBuf)
+S16 cmUnpkTknStr(tknStr, mBuf)
 TknStr *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                     /* counter */
 
-   TRC2(cmUnpTknStr)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@ -2770,20 +2711,19 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrM
+S16 cmUnpkTknStrM
 (
 TknStrM *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStrM(tknStr, mBuf)
+S16 cmUnpkTknStrM(tknStr, mBuf)
 TknStrM *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                     /* counter */
 
-   TRC2(cmUnpTknStrM)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@ -2821,20 +2761,19 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrS
+S16 cmUnpkTknStrS
 (
 TknStrS *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStrS(tknStr, mBuf)
+S16 cmUnpkTknStrS(tknStr, mBuf)
 TknStrS *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                     /* counter */
 
-   TRC2(cmUnpTknStrS)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@ -2872,20 +2811,19 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrE
+S16 cmUnpkTknStrE
 (
 TknStrE *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStrE(tknStr, mBuf)
+S16 cmUnpkTknStrE(tknStr, mBuf)
 TknStrE *tknStr;             /* token string */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
    Cntr i;                     /* counter */
 
-   TRC2(cmUnpTknStrE)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@ -2925,20 +2863,19 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkPnNodeId
+S16 cmUnpkPnNodeId
 (
 PnNodeId  *dst,     /* source PNNI Node Id */
 Buffer *mBuf        /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkPnNodeId (dst, mBuf)
+S16 cmUnpkPnNodeId (dst, mBuf)
 PnNodeId  *dst;     /* source PNNI Node Id */
 Buffer *mBuf;       /* message buffer */
 #endif
 {
    S16 i;
    
-   TRC3(cmUnpkPnNodeId);
    
    for (i = 0; i < PN_NODEID_LEN; i++)
    {
@@ -2966,18 +2903,17 @@ Buffer *mBuf;       /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr4
+S16 cmUnpkTknStr4
 (
 TknStr4 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr4(tknStr, mBuf)
+S16 cmUnpkTknStr4(tknStr, mBuf)
 TknStr4 *tknStr;             /* token string */
 Buffer  *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr4)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
@@ -3002,18 +2938,17 @@ Buffer  *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr12
+S16 cmUnpkTknStr12
 (
 TknStr12 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr12(tknStr, mBuf)
+S16 cmUnpkTknStr12(tknStr, mBuf)
 TknStr12 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr12)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
@@ -3037,18 +2972,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr32
+S16 cmUnpkTknStr32
 (
 TknStr32 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr32(tknStr, mBuf)
+S16 cmUnpkTknStr32(tknStr, mBuf)
 TknStr32 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr32)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
@@ -3072,18 +3006,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr64
+S16 cmUnpkTknStr64
 (
 TknStr64 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr64(tknStr, mBuf)
+S16 cmUnpkTknStr64(tknStr, mBuf)
 TknStr64 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr64)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
@@ -3107,18 +3040,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr132
+S16 cmUnpkTknStr132
 (
 TknStr132 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr132(tknStr, mBuf)
+S16 cmUnpkTknStr132(tknStr, mBuf)
 TknStr132 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr132)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
@@ -3142,18 +3074,17 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr256
+S16 cmUnpkTknStr256
 (
 TknStr256 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr256(tknStr, mBuf)
+S16 cmUnpkTknStr256(tknStr, mBuf)
 TknStr256 *tknStr;             /* token string */
 Buffer    *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr256)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
@@ -3177,20 +3108,19 @@ Buffer    *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknOid
+S16 cmUnpkTknOid
 (
 TknOid   *tknOid,             /* Object Identifier token */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknOid(tknOid, mBuf)
+S16 cmUnpkTknOid(tknOid, mBuf)
 TknOid   *tknOid;             /* Object Identifier token */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
    U16    i;
 
-   TRC2(cmUnpkTknOid)
  
    /* Unpack the token header */
    CMCHKUNPK(oduPackUInt8, &tknOid->pres, mBuf);
@@ -3232,18 +3162,17 @@ Buffer   *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknS32
+S16 cmUnpkTknS32
 (
 TknS32 *tknS32,             /* token S32 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknS32(tknS32, mBuf)
+S16 cmUnpkTknS32(tknS32, mBuf)
 TknS32 *tknS32;             /* token S32 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpTknS32)
 
    /* Token Header */
    CMCHKUNPK(oduPackUInt8, &tknS32->pres, mBuf);
@@ -3273,18 +3202,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkHeader
+S16 cmUnpkHeader
 (
 Header *header,   /* header structure */
 Buffer *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkHeader(header, mBuf)
+S16 cmUnpkHeader(header, mBuf)
 Header *header;   /* header structure */
 Buffer *mBuf;     /* message buffer */
 #endif
 {
-   TRC2(cmUnpHeader)
 
    CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); 
    CMCHKUNPK(oduPackUInt8, &header->msgType, mBuf); 
@@ -3319,18 +3247,17 @@ Buffer *mBuf;     /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmStatus
+S16 cmUnpkCmStatus
 (
 CmStatus *sta,              /* status structure */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmStatus(sta, mBuf)
+S16 cmUnpkCmStatus(sta, mBuf)
 CmStatus *sta;              /* status structure */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkCmStatus)
 
    CMCHKUNPK(oduPackUInt16, &sta->status, mBuf);
    CMCHKUNPK(oduPackUInt16, &sta->reason, mBuf);
@@ -3354,18 +3281,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmAlarm
+S16 cmUnpkCmAlarm
 (
 CmAlarm *alarm,             /* alarm structure */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmAlarm(alarm, mBuf)
+S16 cmUnpkCmAlarm(alarm, mBuf)
 CmAlarm *alarm;             /* alarm structure */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkCmAlarm)
 
    CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf);
    CMCHKUNPK(oduPackUInt16, &alarm->category, mBuf);
@@ -3391,18 +3317,17 @@ Buffer *mBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkSmCfg
+S16 cmUnpkSmCfg
 (
 SmCfg *smCfg,           /* stack manager */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkSmCfg(smCfg, mBuf)
+S16 cmUnpkSmCfg(smCfg, mBuf)
 SmCfg *smCfg;           /* stack manager */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
-   TRC2(cmUnpSmCfg)
 
    CMCHKUNPK(cmUnpkEnt, &smCfg->ent, mBuf); 
    CMCHKUNPK(cmUnpkInst, &smCfg->inst, mBuf); 
@@ -3431,18 +3356,17 @@ Buffer *mBuf;           /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTmrCfg
+S16 cmUnpkTmrCfg
 (
 TmrCfg *tmrCfg,         /* timer configuration */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTmrCfg(tmrCfg, mBuf)
+S16 cmUnpkTmrCfg(tmrCfg, mBuf)
 TmrCfg *tmrCfg;         /* timer configuration */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
-   TRC2(cmUnpTmrCfg)
 
    CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); 
    CMCHKUNPK(oduPackUInt16, &tmrCfg->val, mBuf);
@@ -3465,13 +3389,13 @@ Buffer *mBuf;           /* message buffer */
  */
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknBuf
+S16 cmUnpkTknBuf
 (
 TknBuf *tknBuf,                /* token string */
 Buffer    **tBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknBuf(tknBuf, tBuf)
+S16 cmUnpkTknBuf(tknBuf, tBuf)
 TknBuf *tknBuf;                /* token string */
 Buffer    **tBuf;               /* message buffer */
 #endif
@@ -3479,7 +3403,6 @@ Buffer    **tBuf;               /* message buffer */
    Buffer *mBuf;
 
 
-   TRC2(cmUnpkTknBuf)
 
    mBuf = *tBuf;
   
@@ -3534,18 +3457,17 @@ Buffer    **tBuf;               /* message buffer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkIntf
+S16 cmUnpkIntf
 (
 CmIntf *intf,           /* interface info */
 Buffer *mBuf            /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkIntf(intf, mBuf)
+S16 cmUnpkIntf(intf, mBuf)
 CmIntf *intf;           /* interface info */
 Buffer *mBuf;           /* message buffer */
 #endif
 {
-   TRC2(cmUnpkIntf)
 
    CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); 
    CMCHKUNPK(cmUnpkIntfId,  &intf->intfId,  mBuf);