Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "JIRA-ID ODUHIGH-275 classification of logs of RLC part -2"
[o-du/l2.git]
/
src
/
cm
/
cm_tkns.c
diff --git
a/src/cm/cm_tkns.c
b/src/cm/cm_tkns.c
index
d3ce6db
..
165ea0a
100644
(file)
--- a/
src/cm/cm_tkns.c
+++ b/
src/cm/cm_tkns.c
@@
-66,17
+66,11
@@
File: cm_tkns.c
*
*/
File: cm_tkns.c
*
*/
-#ifdef ANSI
S16 cmPkTknS16
(
TknS16 *tknS16, /* token S16 */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknS16
(
TknS16 *tknS16, /* token S16 */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknS16(tknS16, mBuf)
-TknS16 *tknS16; /* token S16 */
-Buffer *mBuf; /* message buffer */
-#endif
{
if (tknS16->pres)
{
if (tknS16->pres)
@@
-106,17
+100,11
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknBStr32
(
TknBStr32 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknBStr32
(
TknBStr32 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknBStr32(tknStr, mBuf)
-TknBStr32 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
CMPKTKNBSTR(tknStr, mBuf);
{
CMPKTKNBSTR(tknStr, mBuf);
@@
-139,17
+127,11
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStr8
(
TknStr8 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStr8
(
TknStr8 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStr8(tknStr, mBuf)
-TknStr8 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
CMPKTKNSTR(tknStr, mBuf);
{
CMPKTKNSTR(tknStr, mBuf);
@@
-173,17
+155,11
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStr16
(
TknStr16 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStr16
(
TknStr16 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStr16(tknStr, mBuf)
-TknStr16 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
CMPKTKNSTR(tknStr, mBuf);
{
CMPKTKNSTR(tknStr, mBuf);
@@
-207,19
+183,13
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStrOSXL
(
TknStrOSXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStrOSXL
(
TknStrOSXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStrOSXL(tknStr, mBuf)
-TknStrOSXL *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U16
ndx;
+
uint16_t
ndx;
if(tknStr->pres)
if(tknStr->pres)
@@
-255,20
+225,14
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStrBSXL
(
TknStrBSXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStrBSXL
(
TknStrBSXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStrBSXL(tknStr, mBuf)
-TknStrBSXL *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U16
ndx;
-
U16
len;
+
uint16_t
ndx;
+
uint16_t
len;
if(tknStr->pres)
if(tknStr->pres)
@@
-308,19
+272,13
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStrBMP4
(
TknStrBMP4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStrBMP4
(
TknStrBMP4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStrBMP4(tknStr, mBuf)
-TknStrBMP4 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U8
ndx;
+
uint8_t
ndx;
if(tknStr->pres)
if(tknStr->pres)
@@
-356,19
+314,13
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStrBMPXL
(
TknStrBMPXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStrBMPXL
(
TknStrBMPXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStrBMPXL(tknStr, mBuf)
-TknStrBMPXL *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U16
ndx;
+
uint16_t
ndx;
if(tknStr->pres)
if(tknStr->pres)
@@
-402,19
+354,13
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStrUNI4
(
TknStrUNI4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStrUNI4
(
TknStrUNI4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStrUNI4(tknStr, mBuf)
-TknStrUNI4 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U8
ndx;
+
uint8_t
ndx;
if(tknStr->pres)
if(tknStr->pres)
@@
-450,19
+396,13
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmPkTknStrUNIXL
(
TknStrUNIXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmPkTknStrUNIXL
(
TknStrUNIXL *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmPkTknStrUNIXL(tknStr, mBuf)
-TknStrUNIXL *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U16
ndx;
+
uint16_t
ndx;
if(tknStr->pres)
if(tknStr->pres)
@@
-499,17
+439,11
@@
Buffer *mBuf; /* message buffer */
File: cm_tkns.c
*
*/
File: cm_tkns.c
*
*/
-#ifdef ANSI
S16 cmUnpkTknS16
(
TknS16 *tknS16, /* token S16 */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknS16
(
TknS16 *tknS16, /* token S16 */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmUnpkTknS16(tknS16, mBuf)
-TknS16 *tknS16; /* token S16 */
-Buffer *mBuf; /* message buffer */
-#endif
{
/* Token Header */
{
/* Token Header */
@@
-539,17
+473,11
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknBStr32
(
TknBStr32 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknBStr32
(
TknBStr32 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmUnpkTknBStr32(tknStr, mBuf)
-TknBStr32 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
CMUNPKTKNBSTR(tknStr, mBuf);
{
CMUNPKTKNBSTR(tknStr, mBuf);
@@
-573,17
+501,11
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStr8
(
TknStr8 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknStr8
(
TknStr8 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmUnpkTknStr8(tknStr, mBuf)
-TknStr8 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
CMUNPKTKNSTR(tknStr, mBuf);
{
CMUNPKTKNSTR(tknStr, mBuf);
@@
-607,17
+529,11
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStr16
(
TknStr16 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknStr16
(
TknStr16 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmUnpkTknStr16(tknStr, mBuf)
-TknStr16 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
CMUNPKTKNSTR(tknStr, mBuf);
{
CMUNPKTKNSTR(tknStr, mBuf);
@@
-641,21
+557,14
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStrOSXL
(
TknStrOSXL *tknStr, /* token string */
Buffer *mBuf, /* message buffer */
Ptr ptr /* pointer to memory control block */
)
S16 cmUnpkTknStrOSXL
(
TknStrOSXL *tknStr, /* token string */
Buffer *mBuf, /* message buffer */
Ptr ptr /* pointer to memory control block */
)
-#else
-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;
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@
-695,22
+604,15
@@
Ptr ptr; /* pointer to control memory block */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStrBSXL
(
TknStrBSXL *tknStr, /* token string */
Ptr ptr, /* pointer to memory control block */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknStrBSXL
(
TknStrBSXL *tknStr, /* token string */
Ptr ptr, /* pointer to memory control block */
Buffer *mBuf /* message buffer */
)
-#else
-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;
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@
-755,19
+657,13
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStrBMP4
(
TknStrBMP4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknStrBMP4
(
TknStrBMP4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmUnpkTknStrBMP4(tknStr, mBuf)
-TknStrBMP4 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U8
ndx;
+
uint8_t
ndx;
/* Token Header */
/* Token Header */
@@
-803,21
+699,14
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStrBMPXL
(
TknStrBMPXL *tknStr, /* token string */
Buffer *mBuf, /* message buffer */
Ptr ptr /* pointer to memory control block */
)
S16 cmUnpkTknStrBMPXL
(
TknStrBMPXL *tknStr, /* token string */
Buffer *mBuf, /* message buffer */
Ptr ptr /* pointer to memory control block */
)
-#else
-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;
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
@@
-858,19
+747,13
@@
Ptr ptr; /* pointer to control memory block */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStrUNI4
(
TknStrUNI4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
S16 cmUnpkTknStrUNI4
(
TknStrUNI4 *tknStr, /* token string */
Buffer *mBuf /* message buffer */
)
-#else
-S16 cmUnpkTknStrUNI4(tknStr, mBuf)
-TknStrUNI4 *tknStr; /* token string */
-Buffer *mBuf; /* message buffer */
-#endif
{
{
-
U8
ndx;
+
uint8_t
ndx;
/* Token Header */
/* Token Header */
@@
-906,21
+789,14
@@
Buffer *mBuf; /* message buffer */
*
*/
*
*/
-#ifdef ANSI
S16 cmUnpkTknStrUNIXL
(
TknStrUNIXL *tknStr, /* token string */
Buffer *mBuf, /* message buffer */
Ptr ptr /* pointer to memory control block */
)
S16 cmUnpkTknStrUNIXL
(
TknStrUNIXL *tknStr, /* token string */
Buffer *mBuf, /* message buffer */
Ptr ptr /* pointer to memory control block */
)
-#else
-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;
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);