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
Restoring E2AP changes
[o-du/l2.git]
/
src
/
mt
/
ss_strm.c
diff --git
a/src/mt/ss_strm.c
b/src/mt/ss_strm.c
index
fa54d40
..
b4fb65f
100644
(file)
--- a/
src/mt/ss_strm.c
+++ b/
src/mt/ss_strm.c
@@
-76,7
+76,7
@@
\f
/* private variable declarations */
\f
/* private variable declarations */
-
PRIVATE
struct
+
static
struct
{
Region mdRegion; /* region for message and data blocks */
Region datRegion; /* region for data buffers */
{
Region mdRegion; /* region for message and data blocks */
Region datRegion; /* region for data buffers */
@@
-103,20
+103,12
@@
PRIVATE struct
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
S16 ssStrmCfg
(
Region mdRegId, /* region for message and data blocks */
Region datRegId /* region for data buffers */
)
S16 ssStrmCfg
(
Region mdRegId, /* region for message and data blocks */
Region datRegId /* region for data buffers */
)
-#else
-S16 ssStrmCfg(mdRegId, datRegId)
-Region mdRegId; /* region for message and data blocks */
-Region datRegId; /* region for data buffers */
-#endif
{
{
- TRC1(ssStrmCfg);
-
strmCfg.mdRegion = mdRegId;
strmCfg.datRegion = datRegId;
strmCfg.mdRegion = mdRegId;
strmCfg.datRegion = datRegId;
@@
-152,28
+144,18
@@
Region datRegId; /* region for data buffers */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
S32 ssAdjMsg
(
SsMblk *mp, /* message */
S32 len /* bytes to remove */
)
S32 ssAdjMsg
(
SsMblk *mp, /* message */
S32 len /* bytes to remove */
)
-#else
-S32 ssAdjMsg(mp, len)
-SsMblk *mp; /* message */
-S32 len; /* bytes to remove */
-#endif
{
S32 n; /* counter */
S32 size; /* size of mblks of same type as head/tail */
{
S32 n; /* counter */
S32 size; /* size of mblks of same type as head/tail */
-
U8
type; /* message type */
+
uint8_t
type; /* message type */
SsMblk *bp; /* mblk for iteration */
SsMblk *first; /* first mblk to be adjusted */
SsMblk *bp; /* mblk for iteration */
SsMblk *first; /* first mblk to be adjusted */
-
- TRC1(ssAdjMsg);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
@@
-315,17
+297,11
@@
S32 len; /* bytes to remove */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssAllocB
(
S32 size, /* required size */
SsMblk *ssAllocB
(
S32 size, /* required size */
-
U32
pri /* message priority */
+
uint32_t
pri /* message priority */
)
)
-#else
-SsMblk *ssAllocB(size, pri)
-S32 size; /* required size */
-U32 pri; /* message priority */
-#endif
{
SsMblk *bp; /* mblk for iteration */
Data *dat; /* pointer to data buffer */
{
SsMblk *bp; /* mblk for iteration */
Data *dat; /* pointer to data buffer */
@@
-336,10
+312,8
@@
U32 pri; /* message priority */
#ifdef T2K_MEM_LEAK_DBG
char* file = __FILE__;
#ifdef T2K_MEM_LEAK_DBG
char* file = __FILE__;
-
U32
line = __LINE__;
+
uint32_t
line = __LINE__;
#endif
#endif
- TRC1(ssAllocB);
-
UNUSED(pri);
UNUSED(pri);
@@
-348,7
+322,7
@@
U32 pri; /* message priority */
m = (sizeof(SsMblk) + sizeof(SsDblk));
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
m = (sizeof(SsMblk) + sizeof(SsDblk));
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (
U8
*)__FILE__, ENTNC);
+ r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp);
#endif /* SS_HISTOGRAM_SUPPORT */
#else
r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp);
#endif /* SS_HISTOGRAM_SUPPORT */
@@
-368,7
+342,7
@@
U32 pri; /* message priority */
n = size;
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
n = size;
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- r = SAlloc(strmCfg.datRegion, &n, 0, &dat, __LINE__, (
U8
*)__FILE__, ENTNC);
+ r = SAlloc(strmCfg.datRegion, &n, 0, &dat, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
r = SAlloc(strmCfg.datRegion, &n, 0, &dat);
#endif /* SS_HISTOGRAM_SUPPORT */
#else
r = SAlloc(strmCfg.datRegion, &n, 0, &dat);
#endif /* SS_HISTOGRAM_SUPPORT */
@@
-380,7
+354,7
@@
U32 pri; /* message priority */
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- SFree(strmCfg.mdRegion, (Data *)bp, m, __LINE__, (
U8
*)__FILE__, ENTNC);
+ SFree(strmCfg.mdRegion, (Data *)bp, m, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
SFree(strmCfg.mdRegion, (Data *)bp, m);
#endif /* SS_HISTOGRAM_SUPPORT */
#else
SFree(strmCfg.mdRegion, (Data *)bp, m);
#endif /* SS_HISTOGRAM_SUPPORT */
@@
-394,7
+368,7
@@
U32 pri; /* message priority */
}
/* generic set-up-message function */
}
/* generic set-up-message function */
- SS_STRM_INITB(bp, (SsDblk *)(((
U8
*)bp) + sizeof(SsMblk)), dat, size, NULLP);
+ SS_STRM_INITB(bp, (SsDblk *)(((
uint8_t
*)bp) + sizeof(SsMblk)), dat, size, NULLP);
return (bp);
return (bp);
@@
-417,22
+391,14
@@
U32 pri; /* message priority */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssCopyB
(
SsMblk *mp /* message block */
)
SsMblk *ssCopyB
(
SsMblk *mp /* message block */
)
-#else
-SsMblk *ssCopyB(mp)
-SsMblk *mp; /* message block */
-#endif
{
SsMblk *bp; /* mblk for iteration */
{
SsMblk *bp; /* mblk for iteration */
- U8 *ptr; /* pointer to data */
- U32 size; /* size of data content */
-
-
- TRC1(ssCopyB);
+ uint8_t *ptr; /* pointer to data */
+ uint32_t size; /* size of data content */
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-488,23
+454,14
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssCopyMsg
(
SsMblk *mp /* message block */
)
SsMblk *ssCopyMsg
(
SsMblk *mp /* message block */
)
-#else
-SsMblk *ssCopyMsg(mp)
-SsMblk *mp; /* message block */
-#endif
{
SsMblk *first; /* first mblk in message */
SsMblk *bp; /* mblk for iteration */
{
SsMblk *first; /* first mblk in message */
SsMblk *bp; /* mblk for iteration */
-
- TRC1(ssCopyMsg);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
@@
-569,22
+526,14
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssDupB
(
SsMblk *mp /* message block */
)
SsMblk *ssDupB
(
SsMblk *mp /* message block */
)
-#else
-SsMblk *ssDupB(mp)
-SsMblk *mp; /* message block */
-#endif
{
SsMblk *bp; /* mblk for iteration */
/* ss028.103 - Addition of lock for mBuf reference count */
{
SsMblk *bp; /* mblk for iteration */
/* ss028.103 - Addition of lock for mBuf reference count */
- TRC1(ssDupB);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
@@
-667,23
+616,14
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssDupMsg
(
SsMblk *mp /* message block */
)
SsMblk *ssDupMsg
(
SsMblk *mp /* message block */
)
-#else
-SsMblk *ssDupMsg(mp)
-SsMblk *mp; /* message block */
-#endif
{
SsMblk *first; /* first mblk in message */
SsMblk *bp; /* mblk for iteration */
{
SsMblk *first; /* first mblk in message */
SsMblk *bp; /* mblk for iteration */
-
- TRC1(ssDupMsg);
-
-
/* dup the first mblock */
first = bp = ssDupB(mp);
if (bp == NULLP)
/* dup the first mblock */
first = bp = ssDupB(mp);
if (bp == NULLP)
@@
-737,30
+677,18
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssESBAlloc
(
SsMblk *ssESBAlloc
(
-
U8
*base, /* client supplied data buffer */
+
uint8_t
*base, /* client supplied data buffer */
S32 size, /* size of data buffer */
S32 pri, /* message priority */
SsFrtn *fr_rtn /* free routine */
)
S32 size, /* size of data buffer */
S32 pri, /* message priority */
SsFrtn *fr_rtn /* free routine */
)
-#else
-SsMblk *ssESBAlloc(base, size, pri, fr_rtn)
-U8 *base; /* client supplied data buffer */
-S32 size; /* size of data buffer */
-S32 pri; /* message priority */
-SsFrtn *fr_rtn; /* free routine */
-#endif
{
SsMblk *bp; /* mblk for iteration */
Size m; /* mblk + dblk */
S16 r; /* return value */
{
SsMblk *bp; /* mblk for iteration */
Size m; /* mblk + dblk */
S16 r; /* return value */
-
- TRC1(ssESBAlloc);
-
-
UNUSED(pri);
UNUSED(pri);
@@
-777,11
+705,11
@@
SsFrtn *fr_rtn; /* free routine */
m = (sizeof(SsMblk) + sizeof(SsDblk));
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
m = (sizeof(SsMblk) + sizeof(SsDblk));
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (
U8
*)__FILE__, ENTNC);
+ r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
#ifdef T2K_MEM_LEAK_DBG
char* file = __FILE__;
#else
#ifdef T2K_MEM_LEAK_DBG
char* file = __FILE__;
-
U32
line = __LINE__;
+
uint32_t
line = __LINE__;
#endif
r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp);
#endif /* SS_HISTOGRAM_SUPPORT */
#endif
r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp);
#endif /* SS_HISTOGRAM_SUPPORT */
@@
-796,7
+724,7
@@
SsFrtn *fr_rtn; /* free routine */
/* use the generic set-up-message function to initialize everything */
/* use the generic set-up-message function to initialize everything */
- SS_STRM_INITB(bp, (SsDblk *)(((
U8
*)bp) + sizeof(SsMblk)),
+ SS_STRM_INITB(bp, (SsDblk *)(((
uint8_t
*)bp) + sizeof(SsMblk)),
base, size, fr_rtn);
base, size, fr_rtn);
@@
-820,15
+748,10
@@
SsFrtn *fr_rtn; /* free routine */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
Void ssFreeB
(
SsMblk *mp /* message block */
)
Void ssFreeB
(
SsMblk *mp /* message block */
)
-#else
-Void ssFreeB(mp)
-SsMblk *mp; /* message block */
-#endif
{
SsMblk *bp; /* mblk for iteration */
Size size; /* mblk + dblk */
{
SsMblk *bp; /* mblk for iteration */
Size size; /* mblk + dblk */
@@
-836,17
+759,14
@@
SsMblk *mp; /* message block */
#ifdef T2K_MEM_LEAK_DBG
char* file = __FILE__;
#ifdef T2K_MEM_LEAK_DBG
char* file = __FILE__;
-
U32
line = __LINE__;
+
uint32_t
line = __LINE__;
#endif
#endif
- TRC1(ssFreeB);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS341, ERRZERO, "Null pointer");
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS341, ERRZERO, "Null pointer");
-
RETVOID
;
+
return
;
}
#endif
}
#endif
@@
-861,7
+781,7
@@
SsMblk *mp; /* message block */
if (mp->b_datap == NULLP)
{
if (mp->b_datap == NULLP)
{
-
RETVOID
;
+
return
;
}
}
@@
-875,7
+795,7
@@
SsMblk *mp; /* message block */
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (
U8
*)__FILE__, ENTNC);
+ SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
#ifdef T2K_MEM_LEAK_DBG
SFree(strmCfg.mdRegion, (Data *)mp, size);
#else
#ifdef T2K_MEM_LEAK_DBG
SFree(strmCfg.mdRegion, (Data *)mp, size);
@@
-883,7
+803,7
@@
SsMblk *mp; /* message block */
SFree(strmCfg.mdRegion, (Data *)mp, size);
#endif
#endif /* SS_HISTOGRAM_SUPPORT */
SFree(strmCfg.mdRegion, (Data *)mp, size);
#endif
#endif /* SS_HISTOGRAM_SUPPORT */
-
RETVOID
;
+
return
;
}
/* ss028.103 - Addition of lock for mBuf reference count */
}
/* ss028.103 - Addition of lock for mBuf reference count */
@@
-893,7
+813,7
@@
SsMblk *mp; /* message block */
{
SSLOGERROR(ERRCLS_DEBUG, ESS343, ERRZERO,
"Could not lock the mBuf Ref Lock");
{
SSLOGERROR(ERRCLS_DEBUG, ESS343, ERRZERO,
"Could not lock the mBuf Ref Lock");
-
RETVOID
;
+
return
;
}
#endif
}
#endif
@@
-907,7
+827,7
@@
SsMblk *mp; /* message block */
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS344, ERRZERO,
"Could not give the Semaphore");
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS344, ERRZERO,
"Could not give the Semaphore");
-
RETVOID
;
+
return
;
#endif
}
#endif
#endif
}
#endif
@@
-938,7
+858,7
@@
SsMblk *mp; /* message block */
#ifdef SS_HISTOGRAM_SUPPORT
SFree(strmCfg.datRegion, mp->b_datap->db_base,
(Size)(mp->b_datap->db_lim - mp->b_datap->db_base),
#ifdef SS_HISTOGRAM_SUPPORT
SFree(strmCfg.datRegion, mp->b_datap->db_base,
(Size)(mp->b_datap->db_lim - mp->b_datap->db_base),
- __LINE__, (
U8
*)__FILE__, ENTNC);
+ __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
SFree(strmCfg.datRegion, mp->b_datap->db_base,
(Size)(mp->b_datap->db_lim - mp->b_datap->db_base));
#else
SFree(strmCfg.datRegion, mp->b_datap->db_base,
(Size)(mp->b_datap->db_lim - mp->b_datap->db_base));
@@
-956,7
+876,7
@@
SsMblk *mp; /* message block */
bp = (SsMblk *)(mp->b_datap - sizeof (SsMblk));
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
bp = (SsMblk *)(mp->b_datap - sizeof (SsMblk));
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- SFree(strmCfg.mdRegion, (Data *)bp, size, __LINE__, (
U8
*)__FILE__, ENTNC);
+ SFree(strmCfg.mdRegion, (Data *)bp, size, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
SFree(strmCfg.mdRegion, (Data *)bp, size);
#endif /* SS_HISTOGRAM_SUPPORT */
#else
SFree(strmCfg.mdRegion, (Data *)bp, size);
#endif /* SS_HISTOGRAM_SUPPORT */
@@
-964,7
+884,7
@@
SsMblk *mp; /* message block */
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (
U8
*)__FILE__, ENTNC);
+ SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
SFree(strmCfg.mdRegion, (Data *)mp, size);
#endif /* SS_HISTOGRAM_SUPPORT */
#else
SFree(strmCfg.mdRegion, (Data *)mp, size);
#endif /* SS_HISTOGRAM_SUPPORT */
@@
-985,14
+905,14
@@
SsMblk *mp; /* message block */
{
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
{
/* ss001.301: additions */
#ifdef SS_HISTOGRAM_SUPPORT
- SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (
U8
*)__FILE__, ENTNC);
+ SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (
uint8_t
*)__FILE__, ENTNC);
#else
SFree(strmCfg.mdRegion, (Data *)mp, size);
#endif /* SS_HISTOGRAM_SUPPORT */
}
}
#else
SFree(strmCfg.mdRegion, (Data *)mp, size);
#endif /* SS_HISTOGRAM_SUPPORT */
}
}
-
RETVOID
;
+
return
;
} /* ssFreeB */
\f
} /* ssFreeB */
\f
@@
-1011,22
+931,13
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
Void ssFreeMsg
(
SsMblk *mp /* message block */
)
Void ssFreeMsg
(
SsMblk *mp /* message block */
)
-#else
-Void ssFreeMsg(mp)
-SsMblk *mp; /* message block */
-#endif
{
SsMblk *bp; /* mblk for iteration */
{
SsMblk *bp; /* mblk for iteration */
-
- TRC1(ssFreeMsg);
-
-
/* free all the message blocks in the message */
while (mp)
{
/* free all the message blocks in the message */
while (mp)
{
@@
-1035,7
+946,7
@@
SsMblk *mp; /* message block */
ssFreeB(bp);
}
ssFreeB(bp);
}
-
RETVOID
;
+
return
;
} /* ssFreeMsg */
\f
} /* ssFreeMsg */
\f
@@
-1053,26
+964,18
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
Void ssLinkB
(
SsMblk *mp, /* first message block */
SsMblk *bp /* second message block */
)
Void ssLinkB
(
SsMblk *mp, /* first message block */
SsMblk *bp /* second message block */
)
-#else
-Void ssLinkB(mp, bp)
-SsMblk *mp; /* first message block */
-SsMblk *bp; /* second message block */
-#endif
{
{
- TRC1(ssLinkB);
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP || bp == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS345, ERRZERO, "Null pointer");
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP || bp == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS345, ERRZERO, "Null pointer");
-
RETVOID
;
+
return
;
}
#endif
}
#endif
@@
-1087,7
+990,7
@@
SsMblk *bp; /* second message block */
/* link in the passed mblock */
mp->b_cont = bp;
/* link in the passed mblock */
mp->b_cont = bp;
-
RETVOID
;
+
return
;
} /* ssLinkB */
\f
} /* ssLinkB */
\f
@@
-1105,23
+1008,14
@@
SsMblk *bp; /* second message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
S32 ssMsgDSize
(
SsMblk *mp /* message block */
)
S32 ssMsgDSize
(
SsMblk *mp /* message block */
)
-#else
-S32 ssMsgDSize(mp)
-SsMblk *mp; /* message block */
-#endif
{
S32 n; /* temporary */
S32 size; /* size of data */
{
S32 n; /* temporary */
S32 size; /* size of data */
-
- TRC1(ssMsgDSize);
-
-
/* for all blocks that are of type data, count the bytes */
size = 0;
while (mp)
/* for all blocks that are of type data, count the bytes */
size = 0;
while (mp)
@@
-1159,25
+1053,19
@@
SsMblk *mp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
S32 ssPullupMsg
(
SsMblk *mp, /* message block */
S32 len /* number of bytes to align */
)
S32 ssPullupMsg
(
SsMblk *mp, /* message block */
S32 len /* number of bytes to align */
)
-#else
-S32 ssPullupMsg(mp, len)
-SsMblk *mp; /* message block */
-S32 len; /* number of bytes to align */
-#endif
{
SsMblk *bp; /* mblk for iteration */
SsMblk *newbp; /* the new mblk */
SsMblk *prev; /* mblk of same type */
{
SsMblk *bp; /* mblk for iteration */
SsMblk *newbp; /* the new mblk */
SsMblk *prev; /* mblk of same type */
-
U8
*base; /* for swapping data buffers */
-
U8
*lim; /* for swapping data buffers */
-
U8
*rptr; /* for swapping data buffers */
-
U8
*wptr; /* for swapping data buffers */
+
uint8_t
*base; /* for swapping data buffers */
+
uint8_t
*lim; /* for swapping data buffers */
+
uint8_t
*rptr; /* for swapping data buffers */
+
uint8_t
*wptr; /* for swapping data buffers */
/* ss008.301 */
#ifdef SS_DBLK_FREE_RTN
SsFrtn *frtn; /* for swapping data buffers */
/* ss008.301 */
#ifdef SS_DBLK_FREE_RTN
SsFrtn *frtn; /* for swapping data buffers */
@@
-1185,11
+1073,7
@@
S32 len; /* number of bytes to align */
S32 mLen; /* number of bytes in all blocks of same type */
S32 m; /* temporary */
S32 n; /* temporary */
S32 mLen; /* number of bytes in all blocks of same type */
S32 m; /* temporary */
S32 n; /* temporary */
- U8 type; /* message type */
-
-
- TRC1(ssPullupMsg);
-
+ uint8_t type; /* message type */
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
@@
-1362,24
+1246,14
@@
S32 len; /* number of bytes to align */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssRmvB
(
SsMblk *mp, /* message */
SsMblk *bp /* message block */
)
SsMblk *ssRmvB
(
SsMblk *mp, /* message */
SsMblk *bp /* message block */
)
-#else
-SsMblk *ssRmvB(mp, bp)
-SsMblk *mp; /* message */
-SsMblk *bp; /* message block */
-#endif
{
SsMblk *rp; /* mblk that will be returned */
{
SsMblk *rp; /* mblk that will be returned */
-
- TRC1(ssRmvB);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP || bp == NULLP)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP || bp == NULLP)
{
@@
-1445,24
+1319,14
@@
SsMblk *bp; /* message block */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
S32 ssTestB
(
S32 size, /* size required */
S32 ssTestB
(
S32 size, /* size required */
-
U32
pri /* priority of the message buffer */
+
uint32_t
pri /* priority of the message buffer */
)
)
-#else
-S32 ssTestB(size, pri)
-S32 size; /* size required */
-U32 pri; /* priority of the message buffer */
-#endif
{
SsMblk *bp; /* mblk for iteration */
{
SsMblk *bp; /* mblk for iteration */
-
- TRC1(ssTestB);
-
-
bp = ssAllocB(size, pri);
if (bp)
{
bp = ssAllocB(size, pri);
if (bp)
{
@@
-1491,22
+1355,13
@@
U32 pri; /* priority of the message buffer */
* File: ss_strm.c
*
*/
* File: ss_strm.c
*
*/
-#ifdef ANSI
SsMblk *ssUnlinkB
(
SsMblk *mp /* message */
)
SsMblk *ssUnlinkB
(
SsMblk *mp /* message */
)
-#else
-SsMblk *ssUnlinkB(mp)
-SsMblk *mp; /* message */
-#endif
{
SsMblk *bp; /* mblk for iteration */
{
SsMblk *bp; /* mblk for iteration */
-
- TRC1(ssUnlinkB);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (mp == NULLP)
{