X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_tkns.c;h=1543860e5b88bf7fbadbd699190eab4ee35f8e8f;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=da3b002e04481424f63963405dbde883d0eed1c6;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git

diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c
index da3b002e0..1543860e5 100644
--- a/src/cm/cm_tkns.c
+++ b/src/cm/cm_tkns.c
@@ -87,9 +87,9 @@ Buffer *mBuf;               /* message buffer */
    }
 
    /* Token Header */
-   CMCHKPK(SPkU8, tknS16->pres, mBuf);
+   CMCHKPK(oduUnpackUInt8, tknS16->pres, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmPkTknS16 */
   
 
@@ -123,7 +123,7 @@ Buffer    *mBuf;               /* message buffer */
 
    CMPKTKNBSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknBStr32 */
 
@@ -157,7 +157,7 @@ Buffer  *mBuf;               /* message buffer */
 
    CMPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknStr8 */
 
@@ -192,7 +192,7 @@ Buffer   *mBuf;               /* message buffer */
 
    CMPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmPkTknStr16 */
 
@@ -232,15 +232,15 @@ Buffer     *mBuf;               /* message buffer */
       /* 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 */
 
@@ -287,15 +287,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 */
 
@@ -335,17 +335,17 @@ Buffer     *mBuf;               /* message buffer */
       /* 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 */
 
 
@@ -384,15 +384,15 @@ Buffer      *mBuf;               /* message buffer */
       /* 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 */
 
   
@@ -431,17 +431,17 @@ Buffer     *mBuf;               /* message buffer */
       /* 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 */
 
 
@@ -480,15 +480,15 @@ Buffer      *mBuf;               /* message buffer */
       /* 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 */
 
 /*
@@ -524,7 +524,7 @@ Buffer *mBuf;               /* message buffer */
    TRC2(cmUnpkTknS16)
 
    /* Token Header */
-   CMCHKUNPK(SUnpkU8, &tknS16->pres, mBuf);
+   CMCHKUNPK(oduPackUInt8, &tknS16->pres, mBuf);
 
    if (tknS16->pres)
    {
@@ -532,7 +532,7 @@ Buffer *mBuf;               /* message buffer */
       CMCHKUNPK(SUnpkS16, &tknS16->val, mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmUnpkTknS16 */
   
 
@@ -566,7 +566,7 @@ Buffer    *mBuf;               /* message buffer */
 
    CMUNPKTKNBSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknBStr32 */
 
@@ -601,7 +601,7 @@ Buffer  *mBuf;               /* message buffer */
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStr8 */
 
@@ -636,7 +636,7 @@ Buffer   *mBuf;               /* message buffer */
 
    CMUNPKTKNSTR(tknStr, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmUnpkTknStr16 */
 
@@ -673,25 +673,25 @@ Ptr         ptr;                /* pointer to control memory block */
 
    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 */
 
@@ -730,12 +730,12 @@ Buffer     *mBuf;               /* message buffer */
 
    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 +744,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 */
 
@@ -789,21 +789,21 @@ Buffer     *mBuf;               /* message buffer */
    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 */
 
 
@@ -839,26 +839,26 @@ Ptr          ptr;                /* pointer to control memory block */
 
    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 */
 
@@ -894,21 +894,21 @@ Buffer     *mBuf;               /* message buffer */
    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 */
 
 
@@ -944,26 +944,26 @@ Ptr          ptr;                /* pointer to control memory block */
 
    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 */