X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_strm.c;h=ad3ec520821cd046885532594cc8a6b221884ab7;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=2fe524bf185865a9b4ec362c0d3dcfcecfd3fa76;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git

diff --git a/src/mt/ss_strm.c b/src/mt/ss_strm.c
index 2fe524bf1..ad3ec5208 100644
--- a/src/mt/ss_strm.c
+++ b/src/mt/ss_strm.c
@@ -76,7 +76,7 @@
 
 /* private variable declarations */
 
-PRIVATE struct
+static struct
 {
    Region mdRegion;     /* region for message and data blocks */
    Region datRegion;    /* region for data buffers */
@@ -104,25 +104,23 @@ PRIVATE struct
 *
 */
 #ifdef ANSI
-PUBLIC S16 ssStrmCfg
+S16 ssStrmCfg
 (
 Region mdRegId,                 /* region for message and data blocks */
 Region datRegId                 /* region for data buffers */
 )
 #else
-PUBLIC S16 ssStrmCfg(mdRegId, datRegId)
+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;
 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -153,39 +151,35 @@ Region datRegId;                /* region for data buffers */
 *
 */
 #ifdef ANSI
-PUBLIC S32 ssAdjMsg
+S32 ssAdjMsg
 (
 SsMblk *mp,                     /* message */
 S32 len                         /* bytes to remove */
 )
 #else
-PUBLIC S32 ssAdjMsg(mp, len)
+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 */
-   U8 type;                     /* message type */
+   uint8_t type;                     /* message type */
    SsMblk *bp;                  /* mblk for iteration */
    SsMblk *first;               /* first mblk to be adjusted */
 
-
-   TRC1(ssAdjMsg);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS325, ERRZERO, "Null pointer");
-      RETVALUE(0);
+      return (0);
    }
 #endif
 
 
    if (len == 0)                /* nothing to do */
    {
-      RETVALUE(1);
+      return (1);
    }
 
 
@@ -210,7 +204,7 @@ S32 len;                        /* bytes to remove */
       /* if we can't trim len bytes, fail */
       if (len > size)
       {
-         RETVALUE(0);
+         return (0);
       }
 
 
@@ -266,7 +260,7 @@ S32 len;                        /* bytes to remove */
       size += len;
       if (size < 0)
       {
-         RETVALUE(0);
+         return (0);
       }
 
 
@@ -294,7 +288,7 @@ S32 len;                        /* bytes to remove */
    }
 
 
-   RETVALUE(1);
+   return (1);
 } /* ssAdjMsg */
 
 
@@ -316,15 +310,15 @@ S32 len;                        /* bytes to remove */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssAllocB
+SsMblk *ssAllocB
 (
 S32 size,                       /* required size */
-U32 pri                         /* message priority */
+uint32_t pri                         /* message priority */
 )
 #else
-PUBLIC SsMblk *ssAllocB(size, pri)
+SsMblk *ssAllocB(size, pri)
 S32 size;                       /* required size */
-U32 pri;                        /* message priority */
+uint32_t pri;                        /* message priority */
 #endif
 {
    SsMblk *bp;                  /* mblk for iteration */
@@ -336,10 +330,8 @@ U32 pri;                        /* message priority */
 
 #ifdef T2K_MEM_LEAK_DBG
    char* file = __FILE__;
-   U32 line = __LINE__;
+   uint32_t line = __LINE__;
 #endif
-   TRC1(ssAllocB);
-
 
    UNUSED(pri);
 
@@ -348,7 +340,7 @@ U32 pri;                        /* message priority */
    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 */
@@ -358,7 +350,7 @@ U32 pri;                        /* message priority */
       SSLOGERROR(ERRCLS_ADD_RES, ESS326, (ErrVal) r, "SAlloc() failed");
 #endif
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
 
@@ -368,7 +360,7 @@ U32 pri;                        /* message priority */
       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 */
@@ -380,11 +372,11 @@ U32 pri;                        /* message priority */
 
 /* 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 */
-         RETVALUE(NULLP);
+         return (NULLP);
       }
    }
    /* we _can_ allocate a message with an empty data block */
@@ -394,10 +386,10 @@ U32 pri;                        /* message priority */
    }
 
    /* 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);
 
 
-   RETVALUE(bp);
+   return (bp);
 } /* ssAllocB */
 
 
@@ -418,28 +410,25 @@ U32 pri;                        /* message priority */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssCopyB
+SsMblk *ssCopyB
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC SsMblk *ssCopyB(mp)
+SsMblk *ssCopyB(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
    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 (mp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS328, ERRZERO, "Null pointer");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -452,7 +441,7 @@ SsMblk *mp;                     /* message block */
       SSLOGERROR(ERRCLS_ADD_RES, ESS329, ERRZERO, "ssAllocB() failed");
 #endif
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
 
@@ -468,7 +457,7 @@ SsMblk *mp;                     /* message block */
    }
 
 
-   RETVALUE(bp);
+   return (bp);
 } /* ssCopyB */
 
 
@@ -489,27 +478,23 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssCopyMsg
+SsMblk *ssCopyMsg
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC SsMblk *ssCopyMsg(mp)
+SsMblk *ssCopyMsg(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
    SsMblk *first;               /* first mblk in message */
    SsMblk *bp;                  /* mblk for iteration */
 
-
-   TRC1(ssCopyMsg);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS330, ERRZERO, "Null pointer");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -522,7 +507,7 @@ SsMblk *mp;                     /* message block */
       SSLOGERROR(ERRCLS_ADD_RES, ESS331, ERRZERO, "ssCopyB() failed");
 #endif
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
 
@@ -541,14 +526,14 @@ SsMblk *mp;                     /* message block */
 #endif
 
          ssFreeMsg(first);
-         RETVALUE(NULLP);
+         return (NULLP);
       }
 
       bp = bp->b_cont;
    }
 
 
-   RETVALUE(first);
+   return (first);
 } /* ssCopyMsg */
 
 
@@ -570,26 +555,23 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssDupB
+SsMblk *ssDupB
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC SsMblk *ssDupB(mp)
+SsMblk *ssDupB(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    /* ss028.103 - Addition of lock for mBuf reference count */
 
-   TRC1(ssDupB);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS333, ERRZERO, "Null pointer");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -602,7 +584,7 @@ SsMblk *mp;                     /* message block */
       SSLOGERROR(ERRCLS_ADD_RES, ESS334, ERRZERO, "ssAllocB() failed");
 #endif
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
 
@@ -627,7 +609,7 @@ SsMblk *mp;                     /* message block */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS335, ERRZERO,
                      "Could not lock the mBuf Ref Lock");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -642,12 +624,12 @@ SsMblk *mp;                     /* message block */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS336, ERRZERO,
                       "Could not give the Semaphore");
-      RETVALUE(NULLP);
+      return (NULLP);
 #endif
    }
 #endif
 
-   RETVALUE(bp);
+   return (bp);
 } /* ssDupB */
 
 
@@ -668,22 +650,18 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssDupMsg
+SsMblk *ssDupMsg
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC SsMblk *ssDupMsg(mp)
+SsMblk *ssDupMsg(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
    SsMblk *first;               /* first mblk in message */
    SsMblk *bp;                  /* mblk for iteration */
 
-
-   TRC1(ssDupMsg);
-
-
    /* dup the first mblock */
    first = bp = ssDupB(mp);
    if (bp == NULLP)
@@ -692,7 +670,7 @@ SsMblk *mp;                     /* message block */
       SSLOGERROR(ERRCLS_ADD_RES, ESS337, ERRZERO, "ssDupB() failed");
 #endif
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
 
@@ -711,14 +689,14 @@ SsMblk *mp;                     /* message block */
 #endif
 
          ssFreeMsg(first);
-         RETVALUE(NULLP);
+         return (NULLP);
       }
 
       bp = bp->b_cont;
    }
 
 
-   RETVALUE(first);
+   return (first);
 } /* ssDupMsg */
 
 
@@ -738,16 +716,16 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC 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 */
 )
 #else
-PUBLIC SsMblk *ssESBAlloc(base, size, pri, fr_rtn)
-U8 *base;                       /* client supplied data buffer */
+SsMblk *ssESBAlloc(base, size, pri, fr_rtn)
+uint8_t *base;                       /* client supplied data buffer */
 S32 size;                       /* size of data buffer */
 S32 pri;                        /* message priority */
 SsFrtn *fr_rtn;                 /* free routine */
@@ -757,10 +735,6 @@ SsFrtn *fr_rtn;                 /* free routine */
    Size m;                      /* mblk + dblk */
    S16 r;                       /* return value */
 
-
-   TRC1(ssESBAlloc);
-
-
    UNUSED(pri);
 
 
@@ -768,7 +742,7 @@ SsFrtn *fr_rtn;                 /* free routine */
    if (base == NULLP  ||  fr_rtn == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS339, ERRZERO, "Null pointer");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -777,11 +751,11 @@ SsFrtn *fr_rtn;                 /* free routine */
    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__;
-   U32 line = __LINE__;
+   uint32_t line = __LINE__;
 #endif
    r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp);
 #endif /* SS_HISTOGRAM_SUPPORT */
@@ -791,16 +765,16 @@ SsFrtn *fr_rtn;                 /* free routine */
       SSLOGERROR(ERRCLS_ADD_RES, ESS340, (ErrVal) r, "SAlloc() failed");
 #endif
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
 
    /* 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);
 
 
-   RETVALUE(bp);
+   return (bp);
 } /* ssESBAlloc */
 
 
@@ -821,12 +795,12 @@ SsFrtn *fr_rtn;                 /* free routine */
 *
 */
 #ifdef ANSI
-PUBLIC Void ssFreeB
+Void ssFreeB
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC Void ssFreeB(mp)
+Void ssFreeB(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
@@ -836,17 +810,14 @@ SsMblk *mp;                     /* message block */
 
 #ifdef T2K_MEM_LEAK_DBG
    char* file = __FILE__;
-   U32 line = __LINE__;
+   uint32_t line = __LINE__;
 #endif
 
-   TRC1(ssFreeB);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS341, ERRZERO, "Null pointer");
-      RETVOID;
+      return;
    }
 #endif
 
@@ -861,7 +832,7 @@ SsMblk *mp;                     /* message block */
 
    if (mp->b_datap == NULLP)
    {
-      RETVOID;
+      return;
    }
 
 
@@ -875,7 +846,7 @@ SsMblk *mp;                     /* message block */
 
 /* 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);
@@ -883,7 +854,7 @@ SsMblk *mp;                     /* message block */
       SFree(strmCfg.mdRegion, (Data *)mp, size);
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
-      RETVOID;
+      return;
    }
 
    /* ss028.103 - Addition of lock for mBuf reference count */
@@ -893,7 +864,7 @@ SsMblk *mp;                     /* message block */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS343, ERRZERO,
                      "Could not lock the mBuf Ref Lock");
-      RETVOID;
+      return;
    }
 #endif
 
@@ -907,7 +878,7 @@ SsMblk *mp;                     /* message block */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS344, ERRZERO,
                       "Could not give the Semaphore");
-      RETVOID;
+      return;
 #endif
    }
 #endif
@@ -938,7 +909,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), 
-						__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));
@@ -956,7 +927,7 @@ SsMblk *mp;                     /* message block */
          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 */
@@ -964,7 +935,7 @@ SsMblk *mp;                     /* message block */
 
 /* 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 */
@@ -985,14 +956,14 @@ SsMblk *mp;                     /* message block */
       {
 /* 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 */
       }
    }
 
-   RETVOID;
+   return;
 } /* ssFreeB */
 
 
@@ -1012,21 +983,17 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC Void ssFreeMsg
+Void ssFreeMsg
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC Void ssFreeMsg(mp)
+Void ssFreeMsg(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
    SsMblk *bp;                  /* mblk for iteration */
 
-
-   TRC1(ssFreeMsg);
-
-
    /* free all the message blocks in the message */
    while (mp)
    {
@@ -1035,7 +1002,7 @@ SsMblk *mp;                     /* message block */
       ssFreeB(bp);
    }
 
-   RETVOID;
+   return;
 } /* ssFreeMsg */
 
 
@@ -1054,25 +1021,23 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC Void ssLinkB
+Void ssLinkB
 (
 SsMblk *mp,                     /* first message block */
 SsMblk *bp                      /* second message block */
 )
 #else
-PUBLIC Void ssLinkB(mp, bp)
+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");
-      RETVOID;
+      return;
    }
 #endif
 
@@ -1087,7 +1052,7 @@ SsMblk *bp;                     /* second message block */
    /* link in the passed mblock */
    mp->b_cont = bp;
 
-   RETVOID;
+   return;
 } /* ssLinkB */
 
 
@@ -1106,22 +1071,18 @@ SsMblk *bp;                     /* second message block */
 *
 */
 #ifdef ANSI
-PUBLIC S32 ssMsgDSize
+S32 ssMsgDSize
 (
 SsMblk *mp                      /* message block */
 )
 #else
-PUBLIC S32 ssMsgDSize(mp)
+S32 ssMsgDSize(mp)
 SsMblk *mp;                     /* message block */
 #endif
 {
    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)
@@ -1139,7 +1100,7 @@ SsMblk *mp;                     /* message block */
    }
 
 
-   RETVALUE(size);
+   return (size);
 } /* ssMsgDSize */
 
 
@@ -1160,13 +1121,13 @@ SsMblk *mp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC S32 ssPullupMsg
+S32 ssPullupMsg
 (
 SsMblk *mp,                     /* message block */
 S32 len                         /* number of bytes to align */
 )
 #else
-PUBLIC S32 ssPullupMsg(mp, len)
+S32 ssPullupMsg(mp, len)
 SsMblk *mp;                     /* message block */
 S32 len;                        /* number of bytes to align */
 #endif
@@ -1174,10 +1135,10 @@ S32 len;                        /* number of bytes to align */
    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 */
@@ -1185,23 +1146,19 @@ S32 len;                        /* number of bytes to align */
    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)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS346, ERRZERO, "Null pointer");
-      RETVALUE(0);
+      return (0);
    }
    
    if (len < -1)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS347, len, "Invalid length");
-      RETVALUE(0);
+      return (0);
    }
 #endif
 
@@ -1229,14 +1186,14 @@ S32 len;                        /* number of bytes to align */
 
    if (len == 0)
    {
-      RETVALUE(1);
+      return (1);
    }
 
 
    /* do we have enough bytes to pull up? */
    if (len < 0  ||  len > mLen)
    {
-      RETVALUE(0);
+      return (0);
    }
 
 
@@ -1244,7 +1201,7 @@ S32 len;                        /* number of bytes to align */
    newbp = ssAllocB(len, 0);
    if (newbp == NULLP)
    {
-      RETVALUE(0);
+      return (0);
    }
 
    newbp->b_datap->db_type = mp->b_datap->db_type;
@@ -1341,7 +1298,7 @@ S32 len;                        /* number of bytes to align */
    ssFreeB(newbp);
 
 
-   RETVALUE(1);
+   return (1);
 } /* ssPullupMsg */
 
 
@@ -1363,28 +1320,24 @@ S32 len;                        /* number of bytes to align */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssRmvB
+SsMblk *ssRmvB
 (
 SsMblk *mp,                     /* message */
 SsMblk *bp                      /* message block */
 )
 #else
-PUBLIC SsMblk *ssRmvB(mp, bp)
+SsMblk *ssRmvB(mp, bp)
 SsMblk *mp;                     /* message */
 SsMblk *bp;                     /* message block */
 #endif
 {
    SsMblk *rp;                  /* mblk that will be returned */
 
-
-   TRC1(ssRmvB);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP  ||  bp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS348, ERRZERO, "Null pointer");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -1405,7 +1358,7 @@ SsMblk *bp;                     /* message block */
       {
          if (mp == NULLP)
          {
-            RETVALUE((SsMblk *)-1);
+            return ((SsMblk *)-1);
          }
          else if (mp->b_cont == bp)
          {
@@ -1424,7 +1377,7 @@ SsMblk *bp;                     /* message block */
    bp->b_cont = NULLP;
 
 
-   RETVALUE(rp);
+   return (rp);
 } /* ssRmvB */
 
 
@@ -1446,32 +1399,28 @@ SsMblk *bp;                     /* message block */
 *
 */
 #ifdef ANSI
-PUBLIC S32 ssTestB
+S32 ssTestB
 (
 S32 size,                       /* size required */
-U32 pri                         /* priority of the message buffer */
+uint32_t pri                         /* priority of the message buffer */
 )
 #else
-PUBLIC S32 ssTestB(size, pri)
+S32 ssTestB(size, pri)
 S32 size;                       /* size required */
-U32 pri;                        /* priority of the message buffer */
+uint32_t pri;                        /* priority of the message buffer */
 #endif
 {
    SsMblk *bp;                  /* mblk for iteration */
 
-
-   TRC1(ssTestB);
-
-
    bp = ssAllocB(size, pri);
    if (bp)
    {
       ssFreeB(bp);
-      RETVALUE(1);
+      return (1);
    }
 
 
-   RETVALUE(0);
+   return (0);
 } /* ssTestB */
 
 
@@ -1492,26 +1441,22 @@ U32 pri;                        /* priority of the message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC SsMblk *ssUnlinkB
+SsMblk *ssUnlinkB
 (
 SsMblk *mp                      /* message */
 )
 #else
-PUBLIC SsMblk *ssUnlinkB(mp)
+SsMblk *ssUnlinkB(mp)
 SsMblk *mp;                     /* message */
 #endif
 {
    SsMblk *bp;                  /* mblk for iteration */
 
-
-   TRC1(ssUnlinkB);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (mp == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS349, ERRZERO, "Null pointer");
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
 
@@ -1521,7 +1466,7 @@ SsMblk *mp;                     /* message */
    mp->b_cont = NULLP;
 
 
-   RETVALUE(bp);
+   return (bp);
 } /* ssUnlinkB */
 
 /**********************************************************************