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
Replaced old SSI function with new macros jira id - ODUHIGH-212
[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
..
1543860
100644
(file)
--- a/
src/cm/cm_tkns.c
+++ b/
src/cm/cm_tkns.c
@@
-87,9
+87,9
@@
Buffer *mBuf; /* message buffer */
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknS16->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknS16->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknS16 */
\f
} /* end of cmPkTknS16 */
\f
@@
-123,7
+123,7
@@
Buffer *mBuf; /* message buffer */
CMPKTKNBSTR(tknStr, mBuf);
CMPKTKNBSTR(tknStr, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknBStr32 */
} /* end of cmPkTknBStr32 */
@@
-157,7
+157,7
@@
Buffer *mBuf; /* message buffer */
CMPKTKNSTR(tknStr, mBuf);
CMPKTKNSTR(tknStr, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStr8 */
} /* end of cmPkTknStr8 */
@@
-192,7
+192,7
@@
Buffer *mBuf; /* message buffer */
CMPKTKNSTR(tknStr, mBuf);
CMPKTKNSTR(tknStr, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStr16 */
} /* end of cmPkTknStr16 */
@@
-232,15
+232,15
@@
Buffer *mBuf; /* message buffer */
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
- CMCHKPK(
SPkU
8, tknStr->val[ndx], mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->val[ndx], mBuf);
}
/* Length */
}
/* Length */
- CMCHKPK(
SPkU
16, tknStr->len, mBuf);
+ CMCHKPK(
oduUnpackUInt
16, tknStr->len, mBuf);
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknStr->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStrOSXL */
} /* end of cmPkTknStrOSXL */
@@
-287,15
+287,15
@@
Buffer *mBuf; /* message buffer */
/* Value */
for (ndx = 0; ndx < len; ndx++)
{
/* Value */
for (ndx = 0; ndx < len; ndx++)
{
- CMCHKPK(
SPkU
8, tknStr->val[ndx], mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->val[ndx], mBuf);
}
/* Length */
}
/* Length */
- CMCHKPK(
SPkU
16, tknStr->len, mBuf);
+ CMCHKPK(
oduUnpackUInt
16, tknStr->len, mBuf);
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknStr->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStrBSXL */
} /* end of cmPkTknStrBSXL */
@@
-335,17
+335,17
@@
Buffer *mBuf; /* message buffer */
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
- CMCHKPK(
SPkU
16, tknStr->val[ndx], mBuf);
+ CMCHKPK(
oduUnpackUInt
16, tknStr->val[ndx], mBuf);
}
/* Length */
}
/* Length */
- CMCHKPK(
SPkU
8, tknStr->len, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->len, mBuf);
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknStr->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStrBMP4 */
\f
} /* end of cmPkTknStrBMP4 */
\f
@@
-384,15
+384,15
@@
Buffer *mBuf; /* message buffer */
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
- CMCHKPK(
SPkU
16, tknStr->val[ndx], mBuf);
+ CMCHKPK(
oduUnpackUInt
16, tknStr->val[ndx], mBuf);
}
/* Length */
}
/* Length */
- CMCHKPK(
SPkU
16, tknStr->len, mBuf);
+ CMCHKPK(
oduUnpackUInt
16, tknStr->len, mBuf);
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknStr->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStrBMPXL */
\f
} /* end of cmPkTknStrBMPXL */
\f
@@
-431,17
+431,17
@@
Buffer *mBuf; /* message buffer */
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
- CMCHKPK(
SPkU
32, tknStr->val[ndx], mBuf);
+ CMCHKPK(
oduUnpackUInt
32, tknStr->val[ndx], mBuf);
}
/* Length */
}
/* Length */
- CMCHKPK(
SPkU
8, tknStr->len, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->len, mBuf);
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknStr->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStrUNI4 */
\f
} /* end of cmPkTknStrUNI4 */
\f
@@
-480,15
+480,15
@@
Buffer *mBuf; /* message buffer */
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
/* Value */
for (ndx = 0; ndx < tknStr->len; ndx++)
{
- CMCHKPK(
SPkU
32, tknStr->val[ndx], mBuf);
+ CMCHKPK(
oduUnpackUInt
32, tknStr->val[ndx], mBuf);
}
/* Length */
}
/* Length */
- CMCHKPK(
SPkU
16, tknStr->len, mBuf);
+ CMCHKPK(
oduUnpackUInt
16, tknStr->len, mBuf);
}
/* Token Header */
}
/* Token Header */
- CMCHKPK(
SPkU
8, tknStr->pres, mBuf);
+ CMCHKPK(
oduUnpackUInt
8, tknStr->pres, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmPkTknStrUNIXL */
\f
/*
} /* end of cmPkTknStrUNIXL */
\f
/*
@@
-524,7
+524,7
@@
Buffer *mBuf; /* message buffer */
TRC2(cmUnpkTknS16)
/* Token Header */
TRC2(cmUnpkTknS16)
/* Token Header */
- CMCHKUNPK(
SUnpkU
8, &tknS16->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknS16->pres, mBuf);
if (tknS16->pres)
{
if (tknS16->pres)
{
@@
-532,7
+532,7
@@
Buffer *mBuf; /* message buffer */
CMCHKUNPK(SUnpkS16, &tknS16->val, mBuf);
}
CMCHKUNPK(SUnpkS16, &tknS16->val, mBuf);
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknS16 */
\f
} /* end of cmUnpkTknS16 */
\f
@@
-566,7
+566,7
@@
Buffer *mBuf; /* message buffer */
CMUNPKTKNBSTR(tknStr, mBuf);
CMUNPKTKNBSTR(tknStr, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknBStr32 */
} /* end of cmUnpkTknBStr32 */
@@
-601,7
+601,7
@@
Buffer *mBuf; /* message buffer */
CMUNPKTKNSTR(tknStr, mBuf);
CMUNPKTKNSTR(tknStr, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStr8 */
} /* end of cmUnpkTknStr8 */
@@
-636,7
+636,7
@@
Buffer *mBuf; /* message buffer */
CMUNPKTKNSTR(tknStr, mBuf);
CMUNPKTKNSTR(tknStr, mBuf);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStr16 */
} /* end of cmUnpkTknStr16 */
@@
-673,25
+673,25
@@
Ptr ptr; /* pointer to control memory block */
TRC2(cmUnpkTknStrOSXL)
TRC2(cmUnpkTknStrOSXL)
- CMCHKUNPK(
SUnpkU
8, &tknStr->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->pres, mBuf);
if(tknStr->pres)
{
/* Length */
if(tknStr->pres)
{
/* Length */
- CMCHKUNPK(
SUnpkU
16, &tknStr->len, mBuf);
+ CMCHKUNPK(
oduPackUInt
16, &tknStr->len, mBuf);
if( cmGetMem(ptr, tknStr->len, (Ptr *)&tknStr->val) != ROK)
{
if( cmGetMem(ptr, tknStr->len, (Ptr *)&tknStr->val) != ROK)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
}
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
- CMCHKUNPK(
SUnpkU
8, &tknStr->val[tknStr->len - ndx], mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->val[tknStr->len - ndx], mBuf);
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStrOSXL */
} /* end of cmUnpkTknStrOSXL */
@@
-730,12
+730,12
@@
Buffer *mBuf; /* message buffer */
TRC2(cmUnpkTknStrBSXL)
TRC2(cmUnpkTknStrBSXL)
- CMCHKUNPK(
SUnpkU
8, &tknStr->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->pres, mBuf);
if(tknStr->pres)
{
/* Length */
if(tknStr->pres)
{
/* Length */
- CMCHKUNPK(
SUnpkU
16, &tknStr->len, mBuf);
+ CMCHKUNPK(
oduPackUInt
16, &tknStr->len, mBuf);
if (tknStr->len % 8)
len = (tknStr->len/8) + 1;
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)
{
if( cmGetMem(ptr, len, (Ptr *)&tknStr->val) != ROK)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Value */
for (ndx = 1; ndx <= len; ndx++)
{
}
/* Value */
for (ndx = 1; ndx <= len; ndx++)
{
- CMCHKUNPK(
SUnpkU
8, &tknStr->val[len - ndx], mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->val[len - ndx], mBuf);
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStrBSXL */
} /* end of cmUnpkTknStrBSXL */
@@
-789,21
+789,21
@@
Buffer *mBuf; /* message buffer */
TRC2(cmUnpkTknStrBMP4)
/* Token Header */
TRC2(cmUnpkTknStrBMP4)
/* Token Header */
- CMCHKUNPK(
SUnpkU
8, &tknStr->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->pres, mBuf);
if(tknStr->pres)
{
/* Length */
if(tknStr->pres)
{
/* Length */
- CMCHKUNPK(
SUnpkU
8, &tknStr->len, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->len, mBuf);
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
- CMCHKUNPK(
SUnpkU
16, &tknStr->val[tknStr->len - ndx], mBuf);
+ CMCHKUNPK(
oduPackUInt
16, &tknStr->val[tknStr->len - ndx], mBuf);
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStrBMP4 */
\f
} /* end of cmUnpkTknStrBMP4 */
\f
@@
-839,26
+839,26
@@
Ptr ptr; /* pointer to control memory block */
TRC2(cmUnpkTknStrBMPXL)
TRC2(cmUnpkTknStrBMPXL)
- CMCHKUNPK(
SUnpkU
8, &tknStr->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->pres, mBuf);
if(tknStr->pres)
{
/* Length */
if(tknStr->pres)
{
/* Length */
- CMCHKUNPK(
SUnpkU
16, &tknStr->len, mBuf);
+ CMCHKUNPK(
oduPackUInt
16, &tknStr->len, mBuf);
/* Each BMP Character is 2 octet long */
if( cmGetMem(ptr, 2*(tknStr->len), (Ptr *)&tknStr->val) != ROK)
{
/* 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++)
{
}
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
- CMCHKUNPK(
SUnpkU
16, &tknStr->val[tknStr->len - ndx], mBuf);
+ CMCHKUNPK(
oduPackUInt
16, &tknStr->val[tknStr->len - ndx], mBuf);
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStrBMPXL */
} /* end of cmUnpkTknStrBMPXL */
@@
-894,21
+894,21
@@
Buffer *mBuf; /* message buffer */
TRC2(cmUnpkTknStrUNI4)
/* Token Header */
TRC2(cmUnpkTknStrUNI4)
/* Token Header */
- CMCHKUNPK(
SUnpkU
8, &tknStr->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->pres, mBuf);
if(tknStr->pres)
{
/* Length */
if(tknStr->pres)
{
/* Length */
- CMCHKUNPK(
SUnpkU
8, &tknStr->len, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->len, mBuf);
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
- CMCHKUNPK(
SUnpkU
32, &tknStr->val[tknStr->len - ndx], mBuf);
+ CMCHKUNPK(
oduPackUInt
32, &tknStr->val[tknStr->len - ndx], mBuf);
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStrUNI4 */
\f
} /* end of cmUnpkTknStrUNI4 */
\f
@@
-944,26
+944,26
@@
Ptr ptr; /* pointer to control memory block */
TRC2(cmUnpkTknStrUNIXL)
TRC2(cmUnpkTknStrUNIXL)
- CMCHKUNPK(
SUnpkU
8, &tknStr->pres, mBuf);
+ CMCHKUNPK(
oduPackUInt
8, &tknStr->pres, mBuf);
if(tknStr->pres)
{
/* Length */
if(tknStr->pres)
{
/* Length */
- CMCHKUNPK(
SUnpkU
16, &tknStr->len, mBuf);
+ CMCHKUNPK(
oduPackUInt
16, &tknStr->len, mBuf);
/* Each UNI Character is 4 octets long */
if( cmGetMem(ptr, 4*tknStr->len, (Ptr *)&tknStr->val) != ROK)
{
/* 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++)
{
}
/* Value */
for (ndx = 1; ndx <= tknStr->len; ndx++)
{
- CMCHKUNPK(
SUnpkU
32, &tknStr->val[tknStr->len - ndx], mBuf);
+ CMCHKUNPK(
oduPackUInt
32, &tknStr->val[tknStr->len - ndx], mBuf);
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of cmUnpkTknStrUNIXL */
} /* end of cmUnpkTknStrUNIXL */