X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_tkns.c;h=2a477aeba2671b7d05b5ec095c861c1740055cb9;hb=fc7d3ce9647a7da04f5a67fa34419076069defc1;hp=1543860e5b88bf7fbadbd699190eab4ee35f8e8f;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c index 1543860e5..2a477aeba 100644 --- a/src/cm/cm_tkns.c +++ b/src/cm/cm_tkns.c @@ -66,19 +66,12 @@ File: cm_tkns.c * */ -#ifdef ANSI -PUBLIC S16 cmPkTknS16 +S16 cmPkTknS16 ( TknS16 *tknS16, /* token S16 */ Buffer *mBuf /* message buffer */ ) -#else -PUBLIC S16 cmPkTknS16(tknS16, mBuf) -TknS16 *tknS16; /* token S16 */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmPkTknS16) if (tknS16->pres) { @@ -87,7 +80,7 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknS16->pres, mBuf); + CMCHKPK(oduPackUInt8, tknS16->pres, mBuf); return ROK; } /* end of cmPkTknS16 */ @@ -107,19 +100,12 @@ 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) -TknBStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmPkTknBStr32) CMPKTKNBSTR(tknStr, mBuf); @@ -141,19 +127,12 @@ 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) -TknStr8 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmPkTknStr8) CMPKTKNSTR(tknStr, mBuf); @@ -176,19 +155,12 @@ 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) -TknStr16 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmPkTknStr16) CMPKTKNSTR(tknStr, mBuf); @@ -211,34 +183,27 @@ 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) -TknStrOSXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 ndx; + uint16_t ndx; - TRC2(cmPkTknStrOSXL) if(tknStr->pres) { /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf); + CMCHKPK(oduPackUInt8, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); + CMCHKPK(oduPackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; @@ -260,22 +225,15 @@ 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) -TknStrBSXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 ndx; - U16 len; + uint16_t ndx; + uint16_t len; - TRC2(cmPkTknStrBSXL) if(tknStr->pres) { @@ -287,13 +245,13 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < len; ndx++) { - CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf); + CMCHKPK(oduPackUInt8, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); + CMCHKPK(oduPackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; @@ -314,36 +272,29 @@ 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) -TknStrBMP4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 ndx; + uint8_t ndx; - TRC2(cmPkTknStrBMP4) if(tknStr->pres) { /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf); + CMCHKPK(oduPackUInt16, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); + CMCHKPK(oduPackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrBMP4 */ @@ -363,34 +314,27 @@ 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) -TknStrBMPXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 ndx; + uint16_t ndx; - TRC2(cmPkTknStrBMPXL) if(tknStr->pres) { /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf); + CMCHKPK(oduPackUInt16, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); + CMCHKPK(oduPackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrBMPXL */ @@ -410,36 +354,29 @@ 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) -TknStrUNI4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 ndx; + uint8_t ndx; - TRC2(cmPkTknStrUNI4) if(tknStr->pres) { /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf); + CMCHKPK(oduPackUInt32, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); + CMCHKPK(oduPackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrUNI4 */ @@ -459,34 +396,27 @@ 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) -TknStrUNIXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 ndx; + uint16_t ndx; - TRC2(cmPkTknStrUNIXL) if(tknStr->pres) { /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf); + CMCHKPK(oduPackUInt32, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); + CMCHKPK(oduPackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrUNIXL */ @@ -509,22 +439,15 @@ Buffer *mBuf; /* message buffer */ File: cm_tkns.c * */ -#ifdef ANSI -PUBLIC S16 cmUnpkTknS16 +S16 cmUnpkTknS16 ( TknS16 *tknS16, /* token S16 */ Buffer *mBuf /* message buffer */ ) -#else -PUBLIC S16 cmUnpkTknS16(tknS16, mBuf) -TknS16 *tknS16; /* token S16 */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmUnpkTknS16) /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknS16->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknS16->pres, mBuf); if (tknS16->pres) { @@ -550,19 +473,12 @@ 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) -TknBStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmUnpkTknBStr32) CMUNPKTKNBSTR(tknStr, mBuf); @@ -585,19 +501,12 @@ 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) -TknStr8 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmUnpkTknStr8) CMUNPKTKNSTR(tknStr, mBuf); @@ -620,19 +529,12 @@ 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) -TknStr16 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - TRC2(cmUnpkTknStr16) CMUNPKTKNSTR(tknStr, mBuf); @@ -655,30 +557,21 @@ 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) -TknStrOSXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -Ptr ptr; /* pointer to control memory block */ -#endif { - U16 ndx; + uint16_t ndx; - TRC2(cmUnpkTknStrOSXL) - - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf); if( cmGetMem(ptr, tknStr->len, (Ptr *)&tknStr->val) != ROK) { @@ -687,7 +580,7 @@ Ptr ptr; /* pointer to control memory block */ /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - ndx], mBuf); } } @@ -711,31 +604,23 @@ 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) -TknStrBSXL *tknStr; /* token string */ -Ptr ptr; /* pointer to control memory block */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 ndx; - U16 len; + uint16_t ndx; + uint16_t len; - TRC2(cmUnpkTknStrBSXL) - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf); if (tknStr->len % 8) len = (tknStr->len/8) + 1; @@ -749,7 +634,7 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 1; ndx <= len; ndx++) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[len - ndx], mBuf); } } @@ -772,34 +657,27 @@ 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) -TknStrBMP4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 ndx; + uint8_t ndx; - TRC2(cmUnpkTknStrBMP4) /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf); /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->val[tknStr->len - ndx], mBuf); } } @@ -821,30 +699,22 @@ 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) -TknStrBMPXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -Ptr ptr; /* pointer to control memory block */ -#endif { - U16 ndx; + uint16_t ndx; - TRC2(cmUnpkTknStrBMPXL) - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf); /* Each BMP Character is 2 octet long */ if( cmGetMem(ptr, 2*(tknStr->len), (Ptr *)&tknStr->val) != ROK) @@ -854,7 +724,7 @@ Ptr ptr; /* pointer to control memory block */ /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->val[tknStr->len - ndx], mBuf); } } @@ -877,34 +747,27 @@ 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) -TknStrUNI4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 ndx; + uint8_t ndx; - TRC2(cmUnpkTknStrUNI4) /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf); /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt32, &tknStr->val[tknStr->len - ndx], mBuf); } } @@ -926,30 +789,22 @@ 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) -TknStrUNIXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -Ptr ptr; /* pointer to control memory block */ -#endif { - U16 ndx; + uint16_t ndx; - TRC2(cmUnpkTknStrUNIXL) - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf); /* Each UNI Character is 4 octets long */ if( cmGetMem(ptr, 4*tknStr->len, (Ptr *)&tknStr->val) != ROK) @@ -959,7 +814,7 @@ Ptr ptr; /* pointer to control memory block */ /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt32, &tknStr->val[tknStr->len - ndx], mBuf); } }