replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...

[o-du/l2.git] / src / cm / cm_tkns.c

diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c
index da3b002..d3ce6db 100644 (file)
--- a/src/cm/cm_tkns.c
+++ b/src/cm/cm_tkns.c
@@ -67,18 +67,17 @@
  *
  */
 #ifdef ANSI
-PUBLIC S16 cmPkTknS16
+S16 cmPkTknS16
 (
 TknS16 *tknS16,             /* token S16 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknS16(tknS16, mBuf)
+S16 cmPkTknS16(tknS16, mBuf)
 TknS16 *tknS16;             /* token S16 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknS16)
 
    if (tknS16->pres)
    {
@@ -87,9 +86,9 @@ Buffer *mBuf;               /* message buffer */
    }
 
    /* Token Header */
-   CMCHKPK(SPkU8, tknS16->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknS16->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmPkTknS16 */
   
 \f
@@ -108,22 +107,21 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknBStr32
+S16 cmPkTknBStr32
 (
 TknBStr32 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknBStr32(tknStr, mBuf)
+S16 cmPkTknBStr32(tknStr, mBuf)
 TknBStr32 *tknStr;             /* token string */
 Buffer    *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknBStr32)
 
    CMPKTKNBSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknBStr32 */
 
@@ -142,22 +140,21 @@ Buffer    *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr8
+S16 cmPkTknStr8
 (
 TknStr8 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr8(tknStr, mBuf)
+S16 cmPkTknStr8(tknStr, mBuf)
 TknStr8 *tknStr;             /* token string */
 Buffer  *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr8)
 
    CMPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknStr8 */
 
@@ -177,22 +174,21 @@ Buffer  *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStr16
+S16 cmPkTknStr16
 (
 TknStr16 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStr16(tknStr, mBuf)
+S16 cmPkTknStr16(tknStr, mBuf)
 TknStr16 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmPkTknStr16)
 
    CMPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknStr16 */
 
@@ -212,35 +208,34 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrOSXL
+S16 cmPkTknStrOSXL
 (
 TknStrOSXL *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrOSXL(tknStr, mBuf)
+S16 cmPkTknStrOSXL(tknStr, mBuf)
 TknStrOSXL *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 #endif
 {
    U16 ndx;
 
-   TRC2(cmPkTknStrOSXL)
 
    if(tknStr->pres)
    {
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(SPkU8, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(SPkU16, tknStr->len, mBuf);
+      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(SPkU8, tknStr->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknStrOSXL */
 
@@ -261,13 +256,13 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrBSXL
+S16 cmPkTknStrBSXL
 (
 TknStrBSXL *tknStr,             /* token string */
 Buffer     *mBuf              /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrBSXL(tknStr, mBuf)
+S16 cmPkTknStrBSXL(tknStr, mBuf)
 TknStrBSXL *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 #endif
@@ -275,7 +270,6 @@ Buffer     *mBuf;               /* message buffer */
    U16 ndx;
    U16 len;
 
-   TRC2(cmPkTknStrBSXL)
 
    if(tknStr->pres)
    {
@@ -287,15 +281,15 @@ Buffer     *mBuf;               /* message buffer */
       /* Value */
       for (ndx = 0; ndx < len; ndx++)
       {
-         CMCHKPK(SPkU8, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(SPkU16, tknStr->len, mBuf);
+      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(SPkU8, tknStr->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknStrBSXL */
 
@@ -315,37 +309,36 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrBMP4
+S16 cmPkTknStrBMP4
 (
 TknStrBMP4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrBMP4(tknStr, mBuf)
+S16 cmPkTknStrBMP4(tknStr, mBuf)
 TknStrBMP4 *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 #endif
 {
    U8 ndx;
 
-   TRC2(cmPkTknStrBMP4)
 
    if(tknStr->pres)
    {
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(SPkU16, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf);
       }
 
       /* Length */
-      CMCHKPK(SPkU8, tknStr->len, mBuf);
+      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(SPkU8, tknStr->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmPkTknStrBMP4 */
 
 \f
@@ -364,35 +357,34 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrBMPXL
+S16 cmPkTknStrBMPXL
 (
 TknStrBMPXL *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrBMPXL(tknStr, mBuf)
+S16 cmPkTknStrBMPXL(tknStr, mBuf)
 TknStrBMPXL *tknStr;             /* token string */
 Buffer      *mBuf;               /* message buffer */
 #endif
 {
    U16 ndx;
 
-   TRC2(cmPkTknStrBMPXL)
 
    if(tknStr->pres)
    {
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(SPkU16, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(SPkU16, tknStr->len, mBuf);
+      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(SPkU8, tknStr->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmPkTknStrBMPXL */
 
 \f  
@@ -411,37 +403,36 @@ Buffer      *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrUNI4
+S16 cmPkTknStrUNI4
 (
 TknStrUNI4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrUNI4(tknStr, mBuf)
+S16 cmPkTknStrUNI4(tknStr, mBuf)
 TknStrUNI4 *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 #endif
 {
    U8 ndx;
 
-   TRC2(cmPkTknStrUNI4)
 
    if(tknStr->pres)
    {
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(SPkU32, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf);
       }
 
       /* Length */
-      CMCHKPK(SPkU8, tknStr->len, mBuf);
+      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(SPkU8, tknStr->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmPkTknStrUNI4 */
 
 \f
@@ -460,35 +451,34 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmPkTknStrUNIXL
+S16 cmPkTknStrUNIXL
 (
 TknStrUNIXL *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmPkTknStrUNIXL(tknStr, mBuf)
+S16 cmPkTknStrUNIXL(tknStr, mBuf)
 TknStrUNIXL *tknStr;             /* token string */
 Buffer      *mBuf;               /* message buffer */
 #endif
 {
    U16 ndx;
 
-   TRC2(cmPkTknStrUNIXL)
 
    if(tknStr->pres)
    {
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(SPkU32, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(SPkU16, tknStr->len, mBuf);
+      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(SPkU8, tknStr->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmPkTknStrUNIXL */
 \f
 /*
@@ -510,21 +500,20 @@ Buffer      *mBuf;               /* message buffer */
  *
  */
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknS16
+S16 cmUnpkTknS16
 (
 TknS16 *tknS16,             /* token S16 */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknS16(tknS16, mBuf)
+S16 cmUnpkTknS16(tknS16, mBuf)
 TknS16 *tknS16;             /* token S16 */
 Buffer *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknS16)
 
    /* Token Header */
-   CMCHKUNPK(SUnpkU8, &tknS16->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknS16->pres, mBuf);
 
    if (tknS16->pres)
    {
@@ -532,7 +521,7 @@ Buffer *mBuf;               /* message buffer */
       CMCHKUNPK(SUnpkS16, &tknS16->val, mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmUnpkTknS16 */
   
 \f
@@ -551,22 +540,21 @@ Buffer *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknBStr32
+S16 cmUnpkTknBStr32
 (
 TknBStr32 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknBStr32(tknStr, mBuf)
+S16 cmUnpkTknBStr32(tknStr, mBuf)
 TknBStr32 *tknStr;             /* token string */
 Buffer    *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknBStr32)
 
    CMUNPKTKNBSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknBStr32 */
 
@@ -586,22 +574,21 @@ Buffer    *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr8
+S16 cmUnpkTknStr8
 (
 TknStr8 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr8(tknStr, mBuf)
+S16 cmUnpkTknStr8(tknStr, mBuf)
 TknStr8 *tknStr;             /* token string */
 Buffer  *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr8)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStr8 */
 
@@ -621,22 +608,21 @@ Buffer  *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStr16
+S16 cmUnpkTknStr16
 (
 TknStr16 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStr16(tknStr, mBuf)
+S16 cmUnpkTknStr16(tknStr, mBuf)
 TknStr16 *tknStr;             /* token string */
 Buffer   *mBuf;               /* message buffer */
 #endif
 {
-   TRC2(cmUnpkTknStr16)
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStr16 */
 
@@ -656,14 +642,14 @@ Buffer   *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrOSXL
+S16 cmUnpkTknStrOSXL
 (
 TknStrOSXL *tknStr,             /* token string */
 Buffer     *mBuf,               /* message buffer */
 Ptr         ptr                 /* pointer to memory control block */
 )
 #else
-PUBLIC S16 cmUnpkTknStrOSXL(tknStr, mBuf, ptr)
+S16 cmUnpkTknStrOSXL(tknStr, mBuf, ptr)
 TknStrOSXL *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 Ptr         ptr;                /* pointer to control memory block */
@@ -671,27 +657,25 @@ Ptr         ptr;                /* pointer to control memory block */
 {
    U16 ndx;
 
-   TRC2(cmUnpkTknStrOSXL)
-
-   CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
 
       if( cmGetMem(ptr, tknStr->len, (Ptr *)&tknStr->val) != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(SUnpkU8, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStrOSXL */
 
@@ -712,14 +696,14 @@ Ptr         ptr;                /* pointer to control memory block */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrBSXL
+S16 cmUnpkTknStrBSXL
 (
 TknStrBSXL *tknStr,             /* token string */
 Ptr         ptr,                /* pointer to memory control block */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStrBSXL(tknStr, ptr, mBuf)
+S16 cmUnpkTknStrBSXL(tknStr, ptr, mBuf)
 TknStrBSXL *tknStr;             /* token string */
 Ptr         ptr;                /* pointer to control memory block */
 Buffer     *mBuf;               /* message buffer */
@@ -728,14 +712,13 @@ Buffer     *mBuf;               /* message buffer */
    U16 ndx;
    U16 len;
 
-   TRC2(cmUnpkTknStrBSXL)
 
-   CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
 
       if (tknStr->len % 8)
          len = (tknStr->len/8) + 1;
@@ -744,16 +727,16 @@ Buffer     *mBuf;               /* message buffer */
          
       if( cmGetMem(ptr, len, (Ptr *)&tknStr->val) != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       /* Value */
       for (ndx = 1; ndx <= len; ndx++)
       {
-         CMCHKUNPK(SUnpkU8, &tknStr->val[len - ndx], mBuf);
+         CMCHKUNPK(oduPackUInt8, &tknStr->val[len - ndx], mBuf);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStrBSXL */
 
@@ -773,37 +756,36 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrBMP4
+S16 cmUnpkTknStrBMP4
 (
 TknStrBMP4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStrBMP4(tknStr, mBuf)
+S16 cmUnpkTknStrBMP4(tknStr, mBuf)
 TknStrBMP4 *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 #endif
 {
    U8 ndx;
 
-   TRC2(cmUnpkTknStrBMP4)
 
    /* Token Header */
-   CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(SUnpkU16, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmUnpkTknStrBMP4 */
 
 \f
@@ -822,14 +804,14 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrBMPXL
+S16 cmUnpkTknStrBMPXL
 (
 TknStrBMPXL *tknStr,             /* token string */
 Buffer      *mBuf,               /* message buffer */
 Ptr          ptr                 /* pointer to memory control block */
 )
 #else
-PUBLIC S16 cmUnpkTknStrBMPXL(tknStr, mBuf, ptr)
+S16 cmUnpkTknStrBMPXL(tknStr, mBuf, ptr)
 TknStrBMPXL *tknStr;             /* token string */
 Buffer      *mBuf;               /* message buffer */
 Ptr          ptr;                /* pointer to control memory block */
@@ -837,28 +819,27 @@ Ptr          ptr;                /* pointer to control memory block */
 {
    U16 ndx;
 
-   TRC2(cmUnpkTknStrBMPXL)
 
-   CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
 
       /* Each BMP Character is 2 octet long */
       if( cmGetMem(ptr, 2*(tknStr->len), (Ptr *)&tknStr->val) != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(SUnpkU16, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStrBMPXL */
 
@@ -878,37 +859,36 @@ Ptr          ptr;                /* pointer to control memory block */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrUNI4
+S16 cmUnpkTknStrUNI4
 (
 TknStrUNI4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkTknStrUNI4(tknStr, mBuf)
+S16 cmUnpkTknStrUNI4(tknStr, mBuf)
 TknStrUNI4 *tknStr;             /* token string */
 Buffer     *mBuf;               /* message buffer */
 #endif
 {
    U8 ndx;
 
-   TRC2(cmUnpkTknStrUNI4)
 
    /* Token Header */
-   CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(SUnpkU32, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmUnpkTknStrUNI4 */
 
 \f
@@ -927,14 +907,14 @@ Buffer     *mBuf;               /* message buffer */
  */
   
 #ifdef ANSI
-PUBLIC S16 cmUnpkTknStrUNIXL
+S16 cmUnpkTknStrUNIXL
 (
 TknStrUNIXL *tknStr,             /* token string */
 Buffer      *mBuf,               /* message buffer */
 Ptr          ptr                 /* pointer to memory control block */
 )
 #else
-PUBLIC S16 cmUnpkTknStrUNIXL(tknStr, mBuf, ptr)
+S16 cmUnpkTknStrUNIXL(tknStr, mBuf, ptr)
 TknStrUNIXL *tknStr;             /* token string */
 Buffer      *mBuf;               /* message buffer */
 Ptr          ptr;                /* pointer to control memory block */
@@ -942,28 +922,27 @@ Ptr          ptr;                /* pointer to control memory block */
 {
    U16 ndx;
 
-   TRC2(cmUnpkTknStrUNIXL)
 
-   CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
 
       /* Each UNI Character is 4 octets long */
       if( cmGetMem(ptr, 4*tknStr->len, (Ptr *)&tknStr->val) != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(SUnpkU32, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStrUNIXL */