Replaced old SSI function with new macros jira id - ODUHIGH-212

[o-du/l2.git] / src / cm / cm_inet.c

diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c
index cd12a0a..02a4d86 100644 (file)
--- a/src/cm/cm_inet.c
+++ b/src/cm/cm_inet.c
@@ -353,7 +353,7 @@ U32               timeout;              /* timeout value for Poll */
 #endif
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-      RETVALUE(RFAILED);
+      return RFAILED;
    } 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -365,21 +365,21 @@ U32               timeout;              /* timeout value for Poll */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPoll() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
    ret = poll(pollFdArr,numFds,timeout);
    if (ret == 0)
    { 
-      RETVALUE(RTIMEOUT);
+      return (RTIMEOUT);
    }
    if (ret == INET_ERR)
    {
       switch(INET_ERR_CODE)
       {
          case ERR_EINTR:
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
 
          default:
 #ifdef CMINETDBG
@@ -388,14 +388,14 @@ U32               timeout;              /* timeout value for Poll */
                     error(%d)\n", __FILE__, __LINE__, INET_ERR_CODE);
             SPrint(prntBuf);
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
 
       } /* end of switch */
    }
    
    *numRdyFds = (S16)ret;
   
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -441,7 +441,7 @@ U16              eventMask;             /* Event Mask to be set */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -453,7 +453,7 @@ U16              eventMask;             /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollSetFd() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -491,7 +491,7 @@ U16              eventMask;             /* Event Mask to be set */
 #endif /*ALIGN_64BIT */
 #endif /* CMINETDBG */
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -535,7 +535,7 @@ U16               eventMask;         /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollFdIsSet() : Invalid Index (%d) \n",idx);
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -547,13 +547,13 @@ U16               eventMask;         /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollFdIsSet() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
    ret = (pollFdArr[idx].revents & eventMask);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 /*
@@ -596,7 +596,7 @@ U16               eventMask;         /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdREvent() : Invalid Index (%d) \n",idx);
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -608,7 +608,7 @@ U16               eventMask;         /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdREvent() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -643,7 +643,7 @@ U16               eventMask;         /* Event Mask to be set */
 #endif /*ALIGN_64BIT */
 #endif /* CMINETDBG */
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -688,7 +688,7 @@ U16             eventMask;            /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdEvent() : Invalid Index (%d) \n",idx);
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -700,7 +700,7 @@ U16             eventMask;            /* Event Mask to be set */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdEvent() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -735,7 +735,7 @@ U16             eventMask;            /* Event Mask to be set */
 #endif /*ALIGN_64BIT */
 #endif /* CMINETDBG */
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -786,7 +786,7 @@ S16               lastIdx;           /* Last index of poll Fd Array */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollDelFd() : Invalid Index \n Current Index (%d) Delete Index (%d) \n",lastIdx,delIdx);
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -798,7 +798,7 @@ S16               lastIdx;           /* Last index of poll Fd Array */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollDelFd() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -824,7 +824,7 @@ S16               lastIdx;           /* Last index of poll Fd Array */
    pollFdArr[lastIdx].events = 0;
    pollFdArr[lastIdx].revents = 0;
    
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -872,7 +872,7 @@ CmInetPollFd  *pollFdArr;            /* poll FD Array */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollInitFdArr() : Invalid Parameter (pollFdArr is NULL)");
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf);
 #endif /* CMINETDBG */      
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -882,7 +882,7 @@ CmInetPollFd  *pollFdArr;            /* poll FD Array */
       pollFdArr[idx].events = 0;
       pollFdArr[idx].revents = 0;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #if (!(defined(WIN32)) && !(defined(CMINETFLATBUF)))
@@ -962,7 +962,7 @@ PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg)
    ret = SGetDBuf(info->region, info->pool, &dBuf[numBuf]); 
 #endif
    if (ret != ROK)
-      RETVALUE(ret);
+      return (ret);
 
    /* Get the data part */
    ret = SGetDataRx(dBuf[numBuf], 0, &dPtr, &dLen);
@@ -1037,7 +1037,7 @@ PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg)
    msg->msg_iov           = rxArr;
    msg->msg_iovlen        = numBuf;
 
-   RETVALUE(ret);
+   return (ret);
 
 cleanup:
    /* cleanup */
@@ -1046,7 +1046,7 @@ cleanup:
 
    msg->msg_iovlen = 0;
 
-   RETVALUE(ret);
+   return (ret);
 } /* end of buildRecvBuf */
 
 /*
@@ -1141,7 +1141,7 @@ cleanup:
     i++;
    }
 
-   RETVALUE(ret);
+   return (ret);
 } /* end of buildRecvMsg */
 
 \f
@@ -1207,7 +1207,7 @@ MsgLen         *ioLen;          /* cm_inet_c_001.main_50 - Len of dbuf packed in
    ret = SInitNxtDBuf(mBuf);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    iovIdx = 0;
@@ -1222,7 +1222,7 @@ MsgLen         *ioLen;          /* cm_inet_c_001.main_50 - Len of dbuf packed in
       {
          ret = SGetNxtDBuf(mBuf, &dBuf);
          if (ret != ROK)
-            RETVALUE(RFAILED);
+            return RFAILED;
          dBufsToSkip --;
       }
    }
@@ -1273,7 +1273,7 @@ MsgLen         *ioLen;          /* cm_inet_c_001.main_50 - Len of dbuf packed in
    /* cm_inet_c_001.main_50 - Assign the value of dbufs packed in IO-vector */
    *ioLen = allocLen;
 
-   RETVALUE(ret);
+   return (ret);
 
 } /* end of buildSendIovec */
 #endif /* (defined(WIN32)) && !(defined(CMINETFLATBUF)) */
@@ -1388,7 +1388,7 @@ CmInetFd *sockFd;               /* socket file descriptor */
 #endif /* CMINETDBG */
       /* Set sockFd->fd to invalid socket */
       sockFd->fd = CM_INET_INV_SOCKFD;
-      RETVALUE(RFAILED);   
+      return RFAILED;   
    }
 
    /* set socket type */
@@ -1410,7 +1410,7 @@ CmInetFd *sockFd;               /* socket file descriptor */
    if (ret != ROK) 
    {
       ret = cmInetClose(sockFd);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef SS_LINUX
@@ -1420,7 +1420,7 @@ CmInetFd *sockFd;               /* socket file descriptor */
    if (ret != ROK) 
    {
       ret = cmInetClose(sockFd);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* CMINET_BSDCOMPAT */
 #endif /* SS_LINUX */
@@ -1448,7 +1448,7 @@ CmInetFd *sockFd;               /* socket file descriptor */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */      
             ret = cmInetClose(sockFd);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
 #endif /* WIN2K && WIN32 */   
@@ -1467,12 +1467,12 @@ CmInetFd *sockFd;               /* socket file descriptor */
       if (ret != ROK)
       {
          ret = cmInetClose(sockFd);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 #endif  /* CM_LKSCTP_NONBLOCK ends */
 #endif
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetSocket */
 
 \f
@@ -1522,7 +1522,7 @@ CmInetAddr *myAddr;             /* locale Internet address/port */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
        (myAddr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -1594,10 +1594,10 @@ CmInetAddr *myAddr;             /* locale Internet address/port */
 #endif /*ALIGN_64BIT*/
 #endif /* IPV6_SUPPORTED */
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK); 
+   return ROK; 
 } /* end of cmInetBind */
 
 /*cm_inet_c_001.main_38 Updated for TUCL 2.1 Release (Kernel SCTP Support) */
@@ -1665,7 +1665,7 @@ U16                port;         /* port number */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
        (addrLst == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(addrLst->count > CM_INET_NUM_NET_ADDR)
@@ -1686,7 +1686,7 @@ U16                port;         /* port number */
       CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET005, 0, prntBuf);   
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -1718,7 +1718,7 @@ U16                port;         /* port number */
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET057, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          addrs6[idx6].sin6_family      = AF_INET6;
@@ -1748,7 +1748,7 @@ U16                port;         /* port number */
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET058, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          addrs6[idx6].sin6_family      = AF_INET6;
@@ -1819,7 +1819,7 @@ U16                port;         /* port number */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET006, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (addrLst->count > 1)
@@ -1850,7 +1850,7 @@ U16                port;         /* port number */
          CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET059, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       ret = sctp_bindx(sockFd->fd, (Void*)tempAddrPtr, addrLst->count - 1, SCTP_BINDX_ADD_ADDR); 
@@ -1877,10 +1877,10 @@ U16                port;         /* port number */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET007, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK); 
+   return ROK; 
 }
 
 /*
@@ -1956,12 +1956,12 @@ U16                port;         /* port number */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (primAddr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
     /* cm_inet_c_001.main_58 : Added check for addrLst to fix klockwork issue */
    if (addrLst == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* cm_inet_c_001.main_46: Included check for no of address aginst max */
    if( addrLst->count > CM_INET_NUM_NET_ADDR )
@@ -1982,7 +1982,7 @@ U16                port;         /* port number */
       CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET060, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -2013,7 +2013,7 @@ U16                port;         /* port number */
          CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET008, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       addrs6[idx6].sin6_family      = AF_INET6;
@@ -2042,7 +2042,7 @@ U16                port;         /* port number */
          CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET061, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       addrs6[idx6].sin6_family      = AF_INET6;
       addrs6[idx6].sin6_port        = CM_INET_HTON_U16(port);
@@ -2119,7 +2119,7 @@ U16                port;         /* port number */
                CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET009, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
 
             addrs6[idx6].sin6_family      = AF_INET6;
@@ -2149,7 +2149,7 @@ U16                port;         /* port number */
                CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET062, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             addrs6[idx6].sin6_family      = AF_INET6;
             addrs6[idx6].sin6_port        = CM_INET_HTON_U16(port);
@@ -2194,7 +2194,7 @@ U16                port;         /* port number */
    }
    else
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef IPV6_SUPPORTED
@@ -2205,7 +2205,7 @@ U16                port;         /* port number */
    }
    else
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* IPV6_SUPPORTED */
 
@@ -2306,7 +2306,7 @@ U16                port;         /* port number */
       {
          /* non-blocking: connection is in progress */
          case ERR_INPROGRESS:
-            RETVALUE(RINPROGRESS);
+            return (RINPROGRESS);
             break;   
 
          /* 
@@ -2314,37 +2314,37 @@ U16                port;         /* port number */
           * blocking    : connection is already established
           */
          case ERR_ISCONN:
-            RETVALUE(RISCONN);
+            return (RISCONN);
             break;               
 
          /* resource temporarily unavailable */
          case ERR_WOULDBLOCK:
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
             break;
 
          /* non-blocking: connection is in progress */
          case ERR_ALREADY:
-            RETVALUE(RINPROGRESS);
+            return (RINPROGRESS);
             break;
 
          case ERR_INVAL:
-            RETVALUE(RINPROGRESS);
+            return (RINPROGRESS);
             break;
 
          /*  Check for connection refused and timeout errors */
          case ERR_CONNREFUSED:
          case ERR_TIMEDOUT:
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
             break;
 
          /* it is a real error */ 
          default:
-            RETVALUE(RFAILED);
+            return RFAILED;
             break;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -2381,7 +2381,7 @@ CmInetFdType      *assocFd;      /* association fd */
    /* error check on parameters */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (assocFd == NULLP)) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -2405,12 +2405,12 @@ CmInetFdType      *assocFd;      /* association fd */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *assocFd = ret;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -2483,7 +2483,7 @@ U32              context;      /* value to be passed back, if error occurs */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)
        || (info == NULLP) || (mBuf == NULLP) || (len == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -2497,24 +2497,24 @@ U32              context;      /* value to be passed back, if error occurs */
    ret = SFndLenMsg(mBuf, &bufLen);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* max message length is limited to control the memory usage */
    /* casting bufLen to avoid warnings */
    if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen);                  
    if (ret != ROK)
    {
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
    ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen);
    if ((ret != ROK) || (msgLen != bufLen)) 
    {
       SPutSBuf(info->region, info->pool, sendBuf, bufLen);       
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if ( dstAddr != NULLP)
@@ -2539,7 +2539,7 @@ U32              context;      /* value to be passed back, if error occurs */
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET012, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          addr6.sin6_family      = AF_INET6;
@@ -2568,7 +2568,7 @@ U32              context;      /* value to be passed back, if error occurs */
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET064, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          addr6.sin6_family      = AF_INET6;
          addr6.sin6_port        = CM_INET_HTON_U16(port);
@@ -2653,11 +2653,11 @@ U32              context;      /* value to be passed back, if error occurs */
 #endif /* CMINETDBG */
 
       if ((INET_ERR_CODE == ERR_AGAIN) || (INET_ERR_CODE == ERR_WOULDBLOCK))
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
       else if (INET_ERR_CODE == ERR_PIPE)
-         RETVALUE(RCLOSED);
+         return (RCLOSED);
       else 
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
 
    /* cm_inet_c_001.main_58 : Fix for klockwork issue */
@@ -2666,7 +2666,7 @@ U32              context;      /* value to be passed back, if error occurs */
    /* cleanup */
    SPutSBuf(info->region, info->pool, sendBuf, bufLen);       
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -2733,7 +2733,7 @@ CmInetSctpNotification *ntfy;         /* notification parameters */
        (srcAddr == NULLP) || (port == NULLP) || (meminfo == NULLP) || 
        (mBuf == NULLP) || (len == NULLP) || (sinfo == NULLP) || (flag == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -2754,7 +2754,7 @@ CmInetSctpNotification *ntfy;         /* notification parameters */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failed to allocate memory\n");
       CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET065, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    addrlen = sizeof(struct sockaddr_storage);
@@ -2782,7 +2782,7 @@ CmInetSctpNotification *ntfy;         /* notification parameters */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* save the length of the received message */
@@ -3021,7 +3021,7 @@ CmInetSctpNotification *ntfy;         /* notification parameters */
       if (ret != ROK)
       {
          SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       ret = SAddPstMsgMult(recvbuf, *len, *mBuf);
@@ -3029,14 +3029,14 @@ CmInetSctpNotification *ntfy;         /* notification parameters */
       {
          SPutMsg(*mBuf);
          SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
    /* cleanup */
    SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen);       
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -3101,7 +3101,7 @@ CmInetNetAddrLst     *addrlst;      /* peer address list */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
    byteAddress = (U8*)peerAddrList;
@@ -3127,7 +3127,7 @@ CmInetNetAddrLst     *addrlst;      /* peer address list */
 #endif /* CMINETDBG */
 
             sctp_freepaddrs(peerAddrList);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          pAddr6 = (struct sockaddr_in6*)byteAddress;
@@ -3156,7 +3156,7 @@ CmInetNetAddrLst     *addrlst;      /* peer address list */
 
    sctp_freepaddrs(peerAddrList);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -3217,7 +3217,7 @@ Ptr       value;                /* option value */
    /* error check on parameters */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -3332,7 +3332,7 @@ Ptr       value;                /* option value */
 
             default:
                {
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
                break;
          }
@@ -3399,7 +3399,7 @@ Ptr       value;                /* option value */
                CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET017, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
 
             pAddr6 = (struct sockaddr_in6*)&(addrInfo.spinfo_address);
@@ -3464,7 +3464,7 @@ Ptr       value;                /* option value */
                   CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET066, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
 
                pAddr6 = (struct sockaddr_in6*)&(addrParams.spp_address);
@@ -3584,7 +3584,7 @@ Ptr       value;                /* option value */
          break;
 
       default:
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
 
    if (ret == INET_ERR)
@@ -3603,10 +3603,10 @@ Ptr       value;                /* option value */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET067, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }          
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /* cm_inet_c_001.main_54: Added new function cmInetShutDownSctp()*/
@@ -3668,10 +3668,10 @@ PUBLIC S16 cmInetShutDownSctp(sockFd)
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /* cm_inet_c_001.main_61: Added new function cmInetAbortSctpAssoc()*/
@@ -3736,10 +3736,10 @@ PUBLIC S16 cmInetAbortSctpAssoc(sockFd, assocId)
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #endif
@@ -3794,7 +3794,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr)
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (servAddr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -3834,7 +3834,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr)
       {
          /* non-blocking: connection is in progress */
          case ERR_INPROGRESS:
-            RETVALUE(RINPROGRESS);
+            return (RINPROGRESS);
             break;   
 
             /* 
@@ -3842,27 +3842,27 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr)
              * blocking    : connection is already established
              */
          case ERR_ISCONN:
-            RETVALUE(RISCONN);
+            return (RISCONN);
             break;               
 
             /* resource temporarily unavailable */
          case ERR_WOULDBLOCK:
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
             break;
 
             /* non-blocking: connection is in progress */
          case ERR_ALREADY:
-            RETVALUE(RINPROGRESS);
+            return (RINPROGRESS);
             break;
 
          case ERR_INVAL:
-            RETVALUE(RINPROGRESS);
+            return (RINPROGRESS);
             break;
 
             /*  Check for connection refused and timeout errors */
          case ERR_CONNREFUSED:
          case ERR_TIMEDOUT:
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
             break;
 
             /* it is a real error */ 
@@ -3903,12 +3903,12 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr)
 #endif /*ALIGN_64BIT*/
 #endif /* IPV6_SUPPORTED */
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
             break;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetConnect */
 
 \f
@@ -3949,7 +3949,7 @@ S16       backLog;              /* max. number of outstandig connections 0..5 */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (backLog < MIN_BACK_LOG) || (backLog > MAX_BACK_LOG))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -3970,10 +3970,10 @@ S16       backLog;              /* max. number of outstandig connections 0..5 */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET021, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetListen */
 
 \f
@@ -4029,7 +4029,7 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
    /* error check on parameters */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -4052,7 +4052,7 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
       if (INET_ERR_CODE == ERR_WOULDBLOCK)
       {
          /* no connection present to accept */ 
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
       else
       {
@@ -4070,7 +4070,7 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
          CMINETLOGERROR(ERRCLS_DEBUG, ECMINET022, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }     
 
@@ -4095,7 +4095,7 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET071, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
 #endif /* IPV6_SUPPORTED */      
 
@@ -4108,7 +4108,7 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
    if ( ret != ROK) 
    {
       ret = cmInetClose(newSockFd);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef IPV6_SUPPORTED
@@ -4134,7 +4134,7 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
    fromAddr->port    = CM_INET_NTOH_U16(peerAddr->sin_port);
    fromAddr->address = CM_INET_NTOH_U32(peerAddr->sin_addr.s_addr);
 #endif /* IPV6_SUPPORTED */
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetAccept */ 
 
 \f
@@ -4193,7 +4193,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
    tempHdr->cmsg_len = len;  
    *curMsgIdx += len;
 
-   RETVALUE(ROK);
+   return ROK;
 
 }/* end of cmInet4FillTos */ 
 /*
@@ -4304,7 +4304,7 @@ S16             flags;          /* additional control flags, unused */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (info == NULLP) || (len == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -4359,25 +4359,25 @@ S16             flags;          /* additional control flags, unused */
    ret = SFndLenMsg(mBuf, &bufLen);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* max message length is limited to control the memory usage */
    /* casting bufLen to avoid warnings */
    if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen);                  
    if (ret != ROK)
    {
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
    ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen);
    if ((ret != ROK) || (msgLen != bufLen)) 
    {
       /* cleanup */
       SPutSBuf(info->region, info->pool, sendBuf, bufLen);       
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (dstAddr == NULLP)
@@ -4414,14 +4414,14 @@ S16             flags;          /* additional control flags, unused */
       if(INET_ERR_CODE == ERR_AGAIN)
       {
          *len = 0;
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
       }
 
       /* Check for ERR_WOULDBLOCK */
       if(INET_ERR_CODE == ERR_WOULDBLOCK)
       {
          *len = 0;
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
       }
 
 #ifdef CMINETDBG
@@ -4443,7 +4443,7 @@ S16             flags;          /* additional control flags, unused */
       /* check if network is reacheble*/
       if ((INET_ERR_CODE == ERR_NETUNREACH))
       {
-         RETVALUE(RNETFAILED);
+         return (RNETFAILED);
       }
 
 
@@ -4453,10 +4453,10 @@ S16             flags;          /* additional control flags, unused */
             (INET_ERR_CODE == ERR_CONNRESET))
       {
          *len = 0;
-         RETVALUE(RCLOSED);
+         return (RCLOSED);
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *len = ret;
@@ -4467,7 +4467,7 @@ S16             flags;          /* additional control flags, unused */
    {   
       /* cleanup */
       SPutSBuf(info->region, info->pool, sendBuf, bufLen);      
-      RETVALUE(RWOULDBLOCK);
+      return (RWOULDBLOCK);
    }
 
    /* cleanup */
@@ -4477,7 +4477,7 @@ S16             flags;          /* additional control flags, unused */
    ret = SFndLenMsg(mBuf, &msgLen);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* added */
@@ -4602,7 +4602,7 @@ S16             flags;          /* additional control flags, unused */
                /* Compress the message into a single dBuf */
                ret = SCompressMsg(mBuf);
                if (ret != ROK)
-                  RETVALUE(RFAILED);
+                  return RFAILED;
 
                strtEndDBufNum = 0;
                /* Rebuild the send vector */
@@ -4611,13 +4611,13 @@ S16             flags;          /* additional control flags, unused */
                ret = buildSendIovec(mBuf, unSentLen, txArr, numDBufs, &i,
                      &strtEndDBufNum, &ioLen);
                if (ret != ROK)
-                  RETVALUE(RFAILED);
+                  return RFAILED;
 
                retVal = ROK;
             }
          }
          else
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
       msg.msg_iov           = txArr;
       msg.msg_iovlen        = i;
@@ -4642,7 +4642,7 @@ S16             flags;          /* additional control flags, unused */
          {
             /* cm_inet_c_001.main_50 - Return without making length 0, if in case the partial 
                message was sent earlier */
-            RETVALUE(RWOULDBLOCK);
+            return (RWOULDBLOCK);
          }
 #ifdef CMINETDBG
 #ifndef ALIGN_64BIT
@@ -4663,7 +4663,7 @@ S16             flags;          /* additional control flags, unused */
          /* check if network is reacheble or not */
          if ((INET_ERR_CODE == ERR_NETUNREACH))      
          {
-            RETVALUE(RNETFAILED);
+            return (RNETFAILED);
          }
 
          /*  Check if connection was closed by the peer */
@@ -4672,9 +4672,9 @@ S16             flags;          /* additional control flags, unused */
                (INET_ERR_CODE == ERR_CONNABORTED))
          {
             *len = 0;
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
          }
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* cm_inet_c_001.main_50 - Update the length only in successful cases */
@@ -4684,14 +4684,14 @@ S16             flags;          /* additional control flags, unused */
        * to be sent, then return WOULDBLOCK
        */
       if (ret < ioLen)
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
 
       unSentLen -= ret;
 
    } while (*len < msgLen);
 #endif /* WIN32 | CMINETFLATBUF */
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmInetSendDscpMsg */
 
@@ -4816,7 +4816,7 @@ S16             flags;          /* additional control flags, unused */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (info == NULLP) || (len == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -4873,25 +4873,25 @@ S16             flags;          /* additional control flags, unused */
    ret = SFndLenMsg(mBuf, &bufLen);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* max message length is limited to control the memory usage */
    /* casting bufLen to avoid warnings */
    if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen);                  
    if (ret != ROK)
    {
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
    ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen);
    if ((ret != ROK) || (msgLen != bufLen)) 
    {
       /* cleanup */
       SPutSBuf(info->region, info->pool, sendBuf, bufLen);       
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (dstAddr == NULLP)
@@ -4928,14 +4928,14 @@ S16             flags;          /* additional control flags, unused */
       if(INET_ERR_CODE == ERR_AGAIN)
       {
          *len = 0;
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
       }
 
       /* Check for ERR_WOULDBLOCK */
       if(INET_ERR_CODE == ERR_WOULDBLOCK)
       {
          *len = 0;
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
       }
 
 #ifdef CMINETDBG
@@ -4957,7 +4957,7 @@ S16             flags;          /* additional control flags, unused */
       /* check if network is reacheble*/
       if ((INET_ERR_CODE == ERR_NETUNREACH))
       {
-         RETVALUE(RNETFAILED);
+         return (RNETFAILED);
       }
 
 
@@ -4967,10 +4967,10 @@ S16             flags;          /* additional control flags, unused */
             (INET_ERR_CODE == ERR_CONNRESET))
       {
          *len = 0;
-         RETVALUE(RCLOSED);
+         return (RCLOSED);
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *len = ret;
@@ -4981,7 +4981,7 @@ S16             flags;          /* additional control flags, unused */
    {   
       /* cleanup */
       SPutSBuf(info->region, info->pool, sendBuf, bufLen);      
-      RETVALUE(RWOULDBLOCK);
+      return (RWOULDBLOCK);
    }
 
    /* cleanup */
@@ -4991,7 +4991,7 @@ S16             flags;          /* additional control flags, unused */
    ret = SFndLenMsg(mBuf, &msgLen);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* added */
@@ -5108,7 +5108,7 @@ S16             flags;          /* additional control flags, unused */
                /* Compress the message into a single dBuf */
                ret = SCompressMsg(mBuf);
                if (ret != ROK)
-                  RETVALUE(RFAILED);
+                  return RFAILED;
 
                strtEndDBufNum = 0;
                /* Rebuild the send vector */
@@ -5117,13 +5117,13 @@ S16             flags;          /* additional control flags, unused */
                ret = buildSendIovec(mBuf, unSentLen, txArr, numDBufs, &i,
                      &strtEndDBufNum, &ioLen);
                if (ret != ROK)
-                  RETVALUE(RFAILED);
+                  return RFAILED;
 
                retVal = ROK;
             }
          }
          else
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
       msg.msg_iov           = txArr;
       msg.msg_iovlen        = i;
@@ -5148,7 +5148,7 @@ S16             flags;          /* additional control flags, unused */
          {
             /* cm_inet_c_001.main_50 - Return without making length 0, if in case the partial 
                message was sent earlier */
-            RETVALUE(RWOULDBLOCK);
+            return (RWOULDBLOCK);
          }
 #ifdef CMINETDBG
 #ifndef ALIGN_64BIT
@@ -5169,7 +5169,7 @@ S16             flags;          /* additional control flags, unused */
          /* check if network is reacheble or not */
          if ((INET_ERR_CODE == ERR_NETUNREACH))      
          {
-            RETVALUE(RNETFAILED);
+            return (RNETFAILED);
          }
 
          /*  Check if connection was closed by the peer */
@@ -5178,9 +5178,9 @@ S16             flags;          /* additional control flags, unused */
                (INET_ERR_CODE == ERR_CONNABORTED))
          {
             *len = 0;
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
          }
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* cm_inet_c_001.main_50 - Update the length only in successful cases */
@@ -5190,14 +5190,14 @@ S16             flags;          /* additional control flags, unused */
        * to be sent, then return WOULDBLOCK
        */
       if (ret < ioLen)
-         RETVALUE(RWOULDBLOCK);
+         return (RWOULDBLOCK);
 
       unSentLen -= ret;
 
    } while (*len < msgLen);
 #endif /* WIN32 | CMINETFLATBUF */
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmInetSendMsg */
 
@@ -5317,7 +5317,7 @@ U8   protType;  /* whether IPv4/IPv6 socket */
    tempHdr->cmsg_len = len;  
    *curMsgIdx += len;
 
-   RETVALUE(ROK);
+   return ROK;
 
 }/* end of cmInet6BuildSendPktinfo */ 
 #endif /* LOCAL_INTF */
@@ -5382,7 +5382,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
    tempHdr->cmsg_len = len;
    *curMsgIdx += len;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetBuildSendHoplimit  */
 #endif /* SS_LINUX */
 
@@ -5511,7 +5511,7 @@ U8 hdrId;                       /* 0: HBH hdr, 1:Dest Hdr */
    tempHdr->cmsg_len = len;
    *curMsgIdx += len;
 
-   RETVALUE(ROK);    
+   return ROK;    
 } /* end of cmInet6BuildSendHBHOpts */
 
 \f
@@ -5607,7 +5607,7 @@ U32 *curMsgIdx;              /* idx in cmsgBuf where to start building RT hd */
    }
 
    *curMsgIdx += len;  
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInet6BuildSendRouteOpts */
 
 \f
@@ -5713,7 +5713,7 @@ CmInetMemInfo   *info;           /* Memory information */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failure 1 in cmInet6BuildRecvHopOptsArr\n");
       CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET028, 0, prntBuf);
 #endif /* CMINETDBG */     
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }   
 
    curDataIdx = 0;                
@@ -5812,7 +5812,7 @@ CmInetMemInfo   *info;           /* Memory information */
                   (Data *)hbhOptsArr->hbhOpts, numOpts * sizeof(CmInetIpv6HBHHdr));
             hbhOptsArr->numHBHOpts = 0;
             hbhOptsArr->hbhOpts = NULLP;
-            RETVALUE(ROUTRES);
+            return (ROUTRES);
          }
          /* copy the value bytes */
          cmMemcpy((U8 *)hbhOptsArr->hbhOpts[optsIdx].value, 
@@ -5824,7 +5824,7 @@ CmInetMemInfo   *info;           /* Memory information */
       /* get next option */
       optsIdx++; 
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInet6BuildRecvHopOptsArr() */
 
 \f
@@ -5912,7 +5912,7 @@ CmInetMemInfo   *info;     /* Memory information */
       snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failure 1 in cmInet6BuildRecvRtHdr\n");
       CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET032, 0, prntBuf);
 #endif /* CMINETDBG */     
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
    /* copy all the ipv6 addresses */
@@ -5923,7 +5923,7 @@ CmInetMemInfo   *info;     /* Memory information */
       curDataIdx += 16;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInet6BuildRecvRtHdr() */
 
 \f
@@ -5976,7 +5976,7 @@ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */
    hopLimitValue = (U32 *)(cmsgData);
    ipv6HdrParam->ttl.val = (U8)(*hopLimitValue);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif /* IPV6_OPTS_SUPPORTED */
 
@@ -6155,7 +6155,7 @@ S32              flags;         /* additional control flags */
       if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
             (info == NULLP) || (mPtr == NULLP) || (len == NULLP))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -6201,7 +6201,7 @@ S32              flags;         /* additional control flags */
       if (ret != ROK)
       {
          /* ret may be RFAILED or ROUTRES */
-         RETVALUE(ret);
+         return (ret);
       }
    }
    else 
@@ -6237,7 +6237,7 @@ S32              flags;         /* additional control flags */
          ret = cmInetPeekNew(sockFd, NULLP, info, 0, 1, readBuf);
          if (ret == RCLOSED)
          {
-            RETVALUE(ret);
+            return (ret);
          }
          /* cm_inet_c_001.main_56:
           * Returning ROKDNA even cmInetPeekNew returns ROK. Because currently
@@ -6246,7 +6246,7 @@ S32              flags;         /* additional control flags */
           * cmInetGetNumRead at this point because of latency between the ioctl
           * call and recvfrom call issues on some machines ioctl call may 
           * return ZERO even their a data to read.  */
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
    } 
    /* cm_inet_c_001.main_52:  Support for partial reception */
@@ -6313,7 +6313,7 @@ S32              flags;         /* additional control flags */
       ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen);
       if (ret != ROK)
       {
-         RETVALUE(ROUTRES);
+         return (ROUTRES);
       }          
       curLen = bufLen;
       bufPtr = recvBuf;
@@ -6365,7 +6365,7 @@ S32              flags;         /* additional control flags */
                   (INET_ERR_CODE == ERR_WOULDBLOCK))
             {
                *len = 0;
-               RETVALUE(ROKDNA);
+               return (ROKDNA);
             }
 
 
@@ -6376,7 +6376,7 @@ S32              flags;         /* additional control flags */
                   (INET_ERR_CODE == ERR_CONNRESET))
             {
                *len = 0;
-               RETVALUE(RCLOSED);
+               return (RCLOSED);
             }
 
 #ifdef CMINETDBG
@@ -6394,7 +6394,7 @@ S32              flags;         /* additional control flags */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-            RETVALUE(RFAILED);
+            return RFAILED;
          } 
          curLen -= recvLen;
          bufPtr += recvLen;
@@ -6430,7 +6430,7 @@ S32              flags;         /* additional control flags */
 #endif
          {
             SPutSBuf(info->region, info->pool, recvBuf, bufLen);
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
          }
 
       /* cm_inet_c_001.main_48 : If Received 
@@ -6462,7 +6462,7 @@ S32              flags;         /* additional control flags */
 #endif /*ALIGN_64BIT*/
 #endif
             SPutSBuf(info->region, info->pool, recvBuf, bufLen);
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
          }
 
       /* cm_inet_c_001.main_48 : copy data to a message structure */
@@ -6471,7 +6471,7 @@ S32              flags;         /* additional control flags */
       {
          /* cleanup */
          SPutSBuf(info->region, info->pool, recvBuf, bufLen);       
-         RETVALUE(ret);
+         return (ret);
       }
 
 #ifdef CM_INET2  
@@ -6500,7 +6500,7 @@ S32              flags;         /* additional control flags */
       {
          SPutSBuf(info->region, info->pool, recvBuf, bufLen);    
          SPutMsg(mBuf); 
-         RETVALUE(ret);
+         return (ret);
       }
       *mPtr = mBuf;
 
@@ -6552,7 +6552,7 @@ S32              flags;         /* additional control flags */
                numDBufs*sizeof(Buffer*));
          if (ret != ROK)
          {
-            RETVALUE(ROUTRES);
+            return (ROUTRES);
          }                     
 
          /* Allocate dBufs for gather read */ 
@@ -6590,7 +6590,7 @@ S32              flags;         /* additional control flags */
                   /* allocate flat receive buffer */
                   ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen);
                   if (ret != ROK)
-                     RETVALUE(ROUTRES);
+                     return (ROUTRES);
 
                   allocFlatBuf = TRUE;
 
@@ -6610,7 +6610,7 @@ S32              flags;         /* additional control flags */
             {
                SPutSBuf(info->region, info->pool, (Data*)dBufs, 
                      numDBufs*sizeof(Buffer*)); 
-               RETVALUE(ret);
+               return (ret);
             }
          }
 
@@ -6682,9 +6682,9 @@ S32              flags;         /* additional control flags */
                 * against unexpected WOULDBLOCKS observed in solaris
                 */
                if (*mPtr != NULLP)
-                  RETVALUE(ROK);
+                  return ROK;
 
-               RETVALUE(ROKDNA);
+               return (ROKDNA);
             }
 
             /* cm_inet_c_001.main_50 - Free the buffer only when valid, it might be that
@@ -6714,9 +6714,9 @@ S32              flags;         /* additional control flags */
             if (INET_ERR_CODE == ERR_CONNABORTED)
             {
                *len = 0;
-               RETVALUE(RCLOSED);
+               return (RCLOSED);
             }
-            RETVALUE(RFAILED); 
+            return RFAILED; 
          } 
 
          bufLen -= recvLen;
@@ -6764,7 +6764,7 @@ S32              flags;         /* additional control flags */
                               &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.hbhOptsArr,
                               0, info);
                         if (ret != ROK)
-                           RETVALUE(ret);
+                           return (ret);
                         ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.hbhHdrPrsnt = 
                            TRUE; 
                      }
@@ -6781,7 +6781,7 @@ S32              flags;         /* additional control flags */
                               &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.destOptsArr,
                               1, info); 
                         if (ret != ROK)
-                           RETVALUE(ret);
+                           return (ret);
                         ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.destOptsPrsnt = 
                            TRUE;
                      }
@@ -6793,7 +6793,7 @@ S32              flags;         /* additional control flags */
                               &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.rtOptsArr, 
                               info);
                         if (ret != ROK)
-                           RETVALUE(ret);
+                           return (ret);
                         ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.rtOptsPrsnt = 
                            TRUE; 
                      }
@@ -6803,7 +6803,7 @@ S32              flags;         /* additional control flags */
                         ret = cmInet6GetHopLimitValue((U8 *)CMSG_DATA(cmsgptr),
                               cmsgptr->cmsg_len, &ipHdrParams->u.ipv6HdrParm);
                         if (ret != ROK)
-                           RETVALUE(ret);
+                           return (ret);
                      }
                   }
                }  /* for */            
@@ -6894,7 +6894,7 @@ S32              flags;         /* additional control flags */
             {
                /* cleanup */
                SPutSBuf(info->region, info->pool, recvBuf, bufLen);       
-               RETVALUE(ret);
+               return (ret);
             }
 
             /* cm_inet_c_001.main_48 : A 0 len UDP packet could be received */
@@ -6905,7 +6905,7 @@ S32              flags;         /* additional control flags */
                {
                   SPutSBuf(info->region, info->pool, recvBuf, bufLen);    
                   SPutMsg(tempMsg); 
-                  RETVALUE(ret);
+                  return (ret);
                }
             }
 
@@ -6932,7 +6932,7 @@ S32              flags;         /* additional control flags */
                   SPutMsg(*mPtr);
                SPutSBuf(info->region, info->pool, (Data*)dBufs, 
                      numDBufs*sizeof(Buffer*)); 
-               RETVALUE(ret);
+               return (ret);
             }
          }
 
@@ -6952,7 +6952,7 @@ S32              flags;         /* additional control flags */
                SPutMsg(tempMsg);
                SPutSBuf(info->region, info->pool, (Data*)dBufs, 
                      numDBufs*sizeof(Buffer*)); 
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             SPutMsg(tempMsg);
          }
@@ -6998,7 +6998,7 @@ S32              flags;         /* additional control flags */
             {
                SPutMsg(*mPtr);
             }
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
 
          }
 
@@ -7036,7 +7036,7 @@ S32              flags;         /* additional control flags */
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET069, 0, prntBuf);
 #endif
 #endif
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
 
          }
 
@@ -7045,10 +7045,10 @@ S32              flags;         /* additional control flags */
    else
    {
       /* not enough data pending yet */
-      RETVALUE(ROKDNA);
+      return (ROKDNA);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetRecvMsg */
 
 
@@ -7127,7 +7127,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
          (info == NULLP) || (data == NULLP) ||
          (dataPos < 0) || (dataLen < 0))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -7177,7 +7177,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
             (INET_ERR_CODE == ERR_WOULDBLOCK))
       {
          recvLen = 0;
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
       /* cm_inet_c_001.main_61: added host unreachable check */
       if ((INET_ERR_CODE == ERR_CONNABORTED) ||
@@ -7186,7 +7186,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
             (INET_ERR_CODE == ERR_CONNREFUSED))
       {
          recvLen = 0;
-         RETVALUE(RCLOSED);
+         return (RCLOSED);
       }
 #ifdef CMINETDBG
 #ifndef ALIGN_64BIT
@@ -7203,17 +7203,17 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
 #endif
 #endif /* CMINETDBG */
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    } 
    else if (recvLen == 0)
    {
-      RETVALUE(RCLOSED);
+      return (RCLOSED);
    }
 
    /* cm_inet_c_001.main_57 - Fix for validation */
    if (recvLen < (S32)dataLen)  /* maybe happen */
    {
-      RETVALUE(ROKDNA);
+      return (ROKDNA);
    } 
 
    /* setup return destination Internet address */
@@ -7246,7 +7246,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
 #endif /* IPV6_SUPPORTED */
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetPeeknew */
 
 \f
@@ -7321,7 +7321,7 @@ Data            *data;          /* read data */
          (info == NULLP) || (data == NULLP) ||
          (dataPos < 0) || (dataLen < 0))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -7354,9 +7354,9 @@ Data            *data;          /* read data */
           * errors just return RFAILED.
           */
          if (ret == RCLOSED)
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* check if connection got closed */
@@ -7370,7 +7370,7 @@ Data            *data;          /* read data */
           * considered as connection closed. So return ROKDNA instead of 
           * RCLOSED even for TCP sockets
           */
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
       /* added check for TCP/UDP socket. Pending data len in the socket 
          recv buffer is determined by ioctl call in cmInetGetNumRead. 
@@ -7412,7 +7412,7 @@ Data            *data;          /* read data */
          ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen);                  
          if (ret != ROK)
          {
-            RETVALUE(ROUTRES);
+            return (ROUTRES);
          }          
 
          /* added different recvfrom calls with 
@@ -7457,7 +7457,7 @@ Data            *data;          /* read data */
                   (INET_ERR_CODE == ERR_WOULDBLOCK))
             {
                recvLen = 0;
-               RETVALUE(ROKDNA);
+               return (ROKDNA);
             }
 
             /* moved up the cleanup */
@@ -7481,16 +7481,16 @@ Data            *data;          /* read data */
                   (INET_ERR_CODE == ERR_CONNRESET))
             {
                recvLen = 0;
-               RETVALUE(RCLOSED);
+               return (RCLOSED);
             }
-            RETVALUE(RFAILED);
+            return RFAILED;
          } 
 
          if (recvLen < (S32)bufLen)  /* maybe happen */
          {
             /* cleanup */
             SPutSBuf(info->region, info->pool, recvBuf, bufLen);                            
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
          } 
 
          /* copy data */
@@ -7533,16 +7533,16 @@ Data            *data;          /* read data */
       else
       {
          /* not enough data pending yet */
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
    }
    else
    {
       /* no data pending */ 
-      RETVALUE(ROKDNA);
+      return (ROKDNA);
    }   
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetPeek */
 
 \f
@@ -7579,7 +7579,7 @@ CmInetFd *sockFd;               /* socket file descriptor */
    /* error check on parameters */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -7604,10 +7604,10 @@ CmInetFd *sockFd;               /* socket file descriptor */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET037, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetClose */
 
 \f
@@ -7655,7 +7655,7 @@ S32       howTo;                /* operation flag */
    /* error check on parameters */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -7665,7 +7665,7 @@ S32       howTo;                /* operation flag */
       if (INET_ERR_CODE == ERR_NOTCONN)
       {
          /* socket is not connected */ 
-         RETVALUE(ROK); 
+         return ROK; 
       }
       else
       {
@@ -7684,11 +7684,11 @@ S32       howTo;                /* operation flag */
          CMINETLOGERROR(ERRCLS_DEBUG, ECMINET038, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }   
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetShutdown */
 
 \f
@@ -7738,7 +7738,7 @@ S16         *numFdS;            /* number of ready descriptors */
    /* error check on parameters */
    if (numFdS == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -7767,13 +7767,13 @@ S16         *numFdS;            /* number of ready descriptors */
    /* cm_inet_c_001.main_53 -  Return ROKDNA in case select was interrupted */
    if ((ret == INET_ERR) && (INET_ERR_CODE == ERR_EINTR))
    {
-      RETVALUE(ROKDNA);
+      return (ROKDNA);
    }
 
    /* timeout occured */
    if (ret == 0)
    { 
-      RETVALUE(RTIMEOUT);
+      return (RTIMEOUT);
    }
 
    if (ret == INET_ERR)
@@ -7785,7 +7785,7 @@ S16         *numFdS;            /* number of ready descriptors */
       switch(errCode = INET_ERR_CODE)
       {
          case ERR_INVAL:
-            RETVALUE(ROK);
+            return ROK;
 
          default:
 #ifdef CMINETDBG
@@ -7795,7 +7795,7 @@ S16         *numFdS;            /* number of ready descriptors */
                   INET_ERR_CODE);
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET039, 0, prntBuf);
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
 
       } /* end of switch */
    }
@@ -7804,7 +7804,7 @@ S16         *numFdS;            /* number of ready descriptors */
    /* cm_inet_c_001.main_54: Fix for Klockworks issue */
    *numFdS = (S16)ret;   
 
-   RETVALUE(ROK); 
+   return ROK; 
 } /* end of  cmInetSelect */
 
 \f
@@ -8065,14 +8065,14 @@ Ptr       value;                /* option value */
    /* cm_inet_c_001.main_58 : Added NULL check for value field */ 
    if(value == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* error check on parameters */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -8122,7 +8122,7 @@ Ptr       value;                /* option value */
 
             default:
                /* wrong value */
-               RETVALUE(RFAILED);
+               return RFAILED;
                break;
          }
          break;
@@ -8312,7 +8312,7 @@ Ptr       value;                /* option value */
          if (*optVal == CM_INET_OPT_ENABLE)
          {
 #ifdef WIN32 
-            RETVALUE(RNA);    
+            return (RNA);    
 #else
             ret = setsockopt(sockFd->fd, level, IP_HDRINCL,
                   (char*)&enable, sizeof(enable));
@@ -8321,7 +8321,7 @@ Ptr       value;                /* option value */
          else if (*optVal == CM_INET_OPT_DISABLE)
          {
 #ifdef WIN32
-            RETVALUE(RNA);    
+            return (RNA);    
 #else
             ret = setsockopt(sockFd->fd, level, IP_HDRINCL,
                   (char*)&disable, sizeof(disable));
@@ -8343,14 +8343,14 @@ Ptr       value;                /* option value */
             ret = setsockopt(sockFd->fd, level, IP_ROUTER_ALERT,
                   (char*)&enable, sizeof(enable));
             if (ret != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
          }
          else if (*optVal == CM_INET_OPT_DISABLE)
          {   
             ret = setsockopt(sockFd->fd, level, IP_ROUTER_ALERT,
                   (char*)&disable, sizeof(disable));
             if (ret != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
          }   
          break;         
 #endif /* SS_LINUX */
@@ -8358,7 +8358,7 @@ Ptr       value;                /* option value */
          /* set Router Alert socket option */
       case CM_INET_OPT_IP_OPTIONS:
 #if (defined (SS_VW) || defined(SS_LINUX))
-         RETVALUE(RNA);
+         return (RNA);
 #else  
          tempTknStr64=(TknStr64 *)value;
          if (tempTknStr64->pres == TRUE)
@@ -8379,7 +8379,7 @@ Ptr       value;                /* option value */
                      (char *)tempTknStr64->val, tempTknStr64->len);
          }
          else
-            RETVALUE(RFAILED); /* Trying to set IPv4 Hdr option
+            return RFAILED; /* Trying to set IPv4 Hdr option
                                 * without giving option values*/
 #endif /* SS_VW || SS_LINUX */
          break;
@@ -8397,7 +8397,7 @@ Ptr       value;                /* option value */
                   (char*)&enable, sizeof(enable));
 
             if (ret != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
          }
          else if (*optVal == CM_INET_OPT_DISABLE)
          {   
@@ -8406,7 +8406,7 @@ Ptr       value;                /* option value */
                   (char*)&disable, sizeof(disable));
 
             if (ret != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
          }   
          break;   
 #endif /* LOCAL_INTF */            
@@ -8712,7 +8712,7 @@ Ptr       value;                /* option value */
                CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET040, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
 
             pAddr6 = (struct sockaddr_in6*)&(setPrim.ssp_addr);
@@ -8767,7 +8767,7 @@ Ptr       value;                /* option value */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
 
                pAddr6 = (struct sockaddr_in6*)&(addrParams.spp_address);
@@ -8900,7 +8900,7 @@ Ptr       value;                /* option value */
 
       default:  
          /* wrong socket option type */
-         RETVALUE(RFAILED);
+         return RFAILED;
          break;
    }
 
@@ -8920,9 +8920,9 @@ Ptr       value;                /* option value */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET042, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }          
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetSetOpt */
 
 
@@ -8967,7 +8967,7 @@ U32      *dataLen;              /* number of pending octets */
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (dataLen == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -9015,7 +9015,7 @@ U32      *dataLen;              /* number of pending octets */
           * select says is ready to read. This should not be considered as 
           * connection closed.
           */
-         RETVALUE(RCLOSED);
+         return (RCLOSED);
       }
 
       /* removed error check ERR_WOULDBLOCK */ 
@@ -9024,13 +9024,13 @@ U32      *dataLen;              /* number of pending octets */
             (INET_ERR_CODE == ERR_CONNRESET))
       {
          *dataLen = 0;
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
 
 #ifdef SS_LINUX
       /* cm_inet_c_001.main_45: Change 2048 to CM_INET_MAX_UDPRAW_MSGSIZE */
       *dataLen = CM_INET_MAX_UDPRAW_MSGSIZE;
-      RETVALUE(ROK);
+      return ROK;
 #endif /* SS_LINUX */
 
       /* removed error debug printing added for recvfrom call. */
@@ -9049,10 +9049,10 @@ U32      *dataLen;              /* number of pending octets */
       CMINETLOGERROR(ERRCLS_DEBUG, ECMINET043, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetGetNumRead */
 
 \f
@@ -9105,7 +9105,7 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
       /* error check on parameters */
       if ((hostName == NULLP) || (addrTbl == NULLP))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -9127,7 +9127,7 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
             " hostName(%p)\n", INET_ERR_CODE, hostName);
       CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET044, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (hostid->h_addrtype != AF_INET)
    {
@@ -9139,7 +9139,7 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
             INET_ERR_CODE, hostName, hostid->h_addrtype);
       CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET045, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    else
    {
@@ -9167,7 +9167,7 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
                " hostName(%p)\n", INET_ERR_CODE, hostName);
          CMINETLOGERROR(ERRCLS_DEBUG, ECMINET046, 0, prntBuf);
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       CM_COPY_VWIPADDR(vwIpAddr, &(addrTbl->netAddr[addrTbl->count]));
       addrTbl->count++;
@@ -9186,7 +9186,7 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
             INET_ERR_CODE, hostName, hostid.h_addrtype);
       CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET047, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    else
    {
@@ -9202,7 +9202,7 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
 
 #endif /* WIN32  || SS_LINUX || HPOS */
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of cmInetGetHostByName */
 
@@ -9264,7 +9264,7 @@ CmInetIpAddrArr *addrArr;          /* Array of addressed filled in */
    /* error check on parameters */
    if ((hostName == NULLP) || (addrArr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -9288,7 +9288,7 @@ CmInetIpAddrArr *addrArr;          /* Array of addressed filled in */
             err, hostName, addrArr->type);
       CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET048, 0, prntBuf);
 #endif /* CMINETDBG */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef IPV6_SUPPORTED
@@ -9316,7 +9316,7 @@ CmInetIpAddrArr *addrArr;          /* Array of addressed filled in */
                err, hostName, addrArr->type, hostid->h_addrtype);
          CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET049, 0, prntBuf);
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -9343,16 +9343,16 @@ CmInetIpAddrArr *addrArr;          /* Array of addressed filled in */
                err, hostName, hostid->h_addrtype, addrArr->type);
          CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET050, 0, prntBuf);
 #endif /* CMINETDBG */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 #endif /* SS_LINUX */
 #endif /* SUNOS */
 
-   RETVALUE(ROK);
+   return ROK;
 #else
    ret = cmInetGetHostByName(hostName, &addrArr->u.ipv4AddrArr); 
-   RETVALUE(ret);
+   return (ret);
 #endif /* IPV6_SUPPORTED */
 
 } /* end of cmInetGetIpNodeByName */
@@ -9392,7 +9392,7 @@ CmInetIpAddr *address;          /* 4 byte interent address */
    /* error check on parameters */
    if (asciiAddr == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -9400,10 +9400,10 @@ CmInetIpAddr *address;          /* 4 byte interent address */
    if (*address == (U32)ERR_INADDRNONE)
    {
       /* asciiAddr does not contain a valid internet address */ 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -9445,7 +9445,7 @@ S8           **asciiAddr;       /* ascii address representation */
    /* error check on parameters */
    if (asciiAddr == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -9454,10 +9454,10 @@ S8           **asciiAddr;       /* ascii address representation */
    *asciiAddr = inet_ntoa(inetAddr);
    if (*asciiAddr == NULL)
    { 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 /*
 *
@@ -9500,7 +9500,7 @@ U32            len;
    /* error check on parameters */
    if (asciiAddr == NULLP || address == NULLP || len == 0 )
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -9515,10 +9515,10 @@ U32            len;
    }
    if(inet_ntop(domain,address,asciiAddr,len) == NULL)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -9563,17 +9563,17 @@ S8            *asciiAddr;       /* ascii address representation */
    /* error check on parameters */
    if ((asciiAddr == NULLP) || (address == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
    ret = inet_pton(AF_INET, asciiAddr, (void *)address);
    if (ret != 1)
    { 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetPton */
 #endif /* SUNOS */
 #endif /* IPV6_SUPPORTED */
@@ -9618,7 +9618,7 @@ S8            *asciiAddr;       /* ascii address representation */
    /* error check on parameters */
    if ((asciiAddr == NULLP) || (address6 == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -9626,7 +9626,7 @@ S8            *asciiAddr;       /* ascii address representation */
    ret = inet_pton(AF_INET6, asciiAddr, (void *)address6);
    if (ret != 1)
    { 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else
    /* cm_inet_c_001.main_44 : In windows inet_pton is not implemented. so we are using the below function
@@ -9635,7 +9635,7 @@ S8            *asciiAddr;       /* ascii address representation */
    cmMemcpy((U8*)address6, (U8*)&(((struct sockaddr_in6 *)&ss)->sin6_addr), sizeof(CmInetIpAddr6));
 #endif /* WIN32 */
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetPton6 */
 #endif /* IPV6_SUPPORTED */
 #endif /* SS_PS */
@@ -9673,7 +9673,7 @@ S32 *size;                      /* max used memory size */
    *size = CM_INET_MAX_MSG_LEN;
 #endif 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -9709,11 +9709,11 @@ PUBLIC S16 cmInetInit(Void)
    err = WSAStartup(version, &data);
    if (err != 0)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -9748,11 +9748,11 @@ PUBLIC S16 cmInetDeInit(Void)
    err = WSACleanup();
    if (err != 0)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }/* end of cmInetDeInit() */
 
 \f
@@ -9810,7 +9810,7 @@ CmInetAddr *locAddr;
    if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) ||
          (locAddr == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -9836,7 +9836,7 @@ CmInetAddr *locAddr;
 #else
             locAddr->port = CM_INET_NTOH_U16(sockAddr->sin_port);
 #endif /* IPV6_SUPPORTED */
-            RETVALUE(ROK);
+            return ROK;
 
          default:
 #ifdef CMINETDBG
@@ -9853,7 +9853,7 @@ CmInetAddr *locAddr;
             CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET051, 0, prntBuf);
 #endif /* ALIGN_64BIT */
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
       }/* end of switch */
 
    }/* end if */
@@ -9882,7 +9882,7 @@ CmInetAddr *locAddr;
    locAddr->port    = CM_INET_NTOH_U16(sockAddr->sin_port);
    locAddr->address = CM_INET_NTOH_U32(sockAddr->sin_addr.s_addr);
 #endif /* IPV6_SUPPORTED */
-   RETVALUE(ROK);
+   return ROK;
 }/* end of cmInetGetSockName() */
 
 /*  New functions to peek into the file descriptor 
@@ -9926,11 +9926,11 @@ CmInetFdSetInfo *fdSetInfo;
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (fdSetInfo == NULLP)
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
    if (fdSetInfo->initDone == TRUE)
-      RETVALUE(ROK);
+      return ROK;
 
 #ifdef WIN32
    fdSetInfo->numFds = 0;
@@ -9977,7 +9977,7 @@ CmInetFdSetInfo *fdSetInfo;
 #endif /* SUNOS  || SS_LINUX || SS_VW || HPOS */   
 
    fdSetInfo->initDone = TRUE;
-   RETVALUE(ROK);
+   return ROK;
 }/* end of cmInetFdSetInfoInit() */
 
 \f
@@ -10028,25 +10028,25 @@ CmInetFdType    *sockFd;
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if ((fdSetInfo == NULLP) || (fdSet == NULLP) || (sockFd == NULLP))
-      RETVALUE(RFAILED);
+      return RFAILED;
 
    if (fdSetInfo->initDone != TRUE)
-      RETVALUE(RNA);
+      return (RNA);
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
 #ifdef WIN32
 #if (ERRCLASS & ERRCLS_DEBUG)
    if (fdSetInfo->numFds > FD_SETSIZE)
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif /* ERRCLASS & ERRCLS_DEBUG */
    /* cm_inet_c_001.main_32 :  Corrected check for number of fd set in
       a fdset for WIN32*/
    if (fdSetInfo->numFds >= fdSet->fd_count)
-      RETVALUE(ROKDNA);
+      return (ROKDNA);
 
    *sockFd = fdSet->fd_array[fdSetInfo->numFds];
    fdSetInfo->numFds += 1;
-   RETVALUE(ROK);
+   return ROK;
 #endif /* WIN32 */
 
    /* cm_inet_c_001.main_59: Protected under if not defined WIN32 */
@@ -10094,7 +10094,7 @@ CmInetFdType    *sockFd;
                   *sockFd += (curIdx  * (sizOfFdSetArElem << 3));
                   /* Clear the file descriptor */
                   *tempByte &= ~(1 << bitPos);
-                  RETVALUE(ROK);
+                  return ROK;
                }
                if (fdSetInfo->bigEndian)
                   tempByte -= 1;
@@ -10106,9 +10106,9 @@ CmInetFdType    *sockFd;
    }
 
    if (!found)
-      RETVALUE(ROKDNA);
+      return (ROKDNA);
 
-   RETVALUE(ROK);
+   return ROK;
 #endif /* SUNOS || SS_LINUX || SS_VW || HPOS */
 } /* end of cmInetGetFd */
 
@@ -10194,7 +10194,7 @@ CmInetNetAddr      *address;           /* IP Address */
             ((val[idx] < 'A') || (val[idx] > 'F')))
       {
          /* Not a digit */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* (ERRCLASS & ERRCLS_DEBUG) */
 
@@ -10213,7 +10213,7 @@ CmInetNetAddr      *address;           /* IP Address */
    if ((val[idx] != '.') && (val[idx] != ':'))
    {
       /* Not a digit */
-      RETVALUE(RFAILED);
+      return RFAILED;
    } /* if, couldn't determine IPV4 or IPV6 */
 #endif /* (ERRCLASS & ERRCLS_DEBUG) */
 
@@ -10240,7 +10240,7 @@ CmInetNetAddr      *address;           /* IP Address */
             if (compressed == TRUE)
             {
                /* can't have 2 :: */
-               RETVALUE(RFAILED);
+               return RFAILED;
             } /* if, 2 :: */
 #endif /* (ERRCLASS & ERRCLS_DEBUG) */
 
@@ -10272,7 +10272,7 @@ CmInetNetAddr      *address;           /* IP Address */
                   an IPV6 address */
                if (retVal != ROK)
                {
-                  RETVALUE(retVal);
+                  return (retVal);
                }
                embedIPV4 = TRUE;
                break;
@@ -10284,7 +10284,7 @@ CmInetNetAddr      *address;           /* IP Address */
                   ((val[idx] < 'A') || (val[idx] > 'F')))
             {
                /* Not a digit */
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
 #endif /* (ERRCLASS & ERRCLS_DEBUG) */
 
@@ -10336,7 +10336,7 @@ CmInetNetAddr      *address;           /* IP Address */
    } /* else, IPV6 */
 #endif /* IPV6_SUPPORTED */
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmInetConvertStrToIpAddr */
 
 \f
@@ -10392,7 +10392,7 @@ U8                 *val;               /* Domain Name String */
          if (val[idx] < '0' || val[idx] > '9')
          {
             /* Not a digit */
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 #endif /* (ERRCLASS & ERRCLS_DEBUG) */
 
@@ -10405,7 +10405,7 @@ U8                 *val;               /* Domain Name String */
       idx++;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmInetAsciiToIpv4 */
 
 /* cm_inet_c_001.main_34:Added wrapper function for getaddrinfo and freeaddrinfo */
@@ -10450,7 +10450,7 @@ CmInetAddrInfo           **res;          /* Link list of addrInfo structure */
    /* error check on parameters */
    if ((node == NULLP) || (hints == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -10473,7 +10473,7 @@ CmInetAddrInfo           **res;          /* Link list of addrInfo structure */
 #endif /* ALIGN_64BIT */
 #endif /* CMINETDBG */
    }
-   RETVALUE(ret); 
+   return (ret); 
 } /* end of cmInetGetAddrInfo */
 
 \f
@@ -10599,7 +10599,7 @@ S32              flags;         /* additional control flags */
       /* error check on parameters */
       if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 
@@ -10616,7 +10616,7 @@ S32              flags;         /* additional control flags */
    if (ret != ROK)
    {
       /* ret may be RFAILED or ROUTRES */
-      RETVALUE(ret);
+      return (ret);
    }
 
    /* check if connection got closed */
@@ -10632,7 +10632,7 @@ S32              flags;         /* additional control flags */
           * considered as connection closed. So return ROKDNA instead of 
           * RCLOSED
           */
-         RETVALUE(ROKDNA);
+         return (ROKDNA);
       }
       else
          /* clear error if there is any, because if there is internal error
@@ -10670,7 +10670,7 @@ S32              flags;         /* additional control flags */
             CMINETLOGERROR(ERRCLS_DEBUG, ECMINET054, 0, prntBuf);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          else
          {
@@ -10690,7 +10690,7 @@ S32              flags;         /* additional control flags */
 #endif /* defined(SUNOS) || defined(SS_LINUX) */
 #endif /* defined(SS_VW) || defined(HPOS) || defined(SS_PS) */
 
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
          }      
       }
    }/* if (pendLen == 0)*/
@@ -10744,7 +10744,7 @@ S32              flags;         /* additional control flags */
                (INET_ERR_CODE == ERR_WOULDBLOCK))
          {
             *len = 0; 
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
          }
 
 
@@ -10755,7 +10755,7 @@ S32              flags;         /* additional control flags */
                (INET_ERR_CODE == ERR_CONNRESET))
          {
             *len = 0;
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
          }
 
 #ifdef CMINETDBG
@@ -10773,7 +10773,7 @@ S32              flags;         /* additional control flags */
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       } 
 
       if(recvLen < curLen)
@@ -10829,7 +10829,7 @@ S32              flags;         /* additional control flags */
                (INET_ERR_CODE == ERR_WOULDBLOCK))
          {
             *len = 0;  
-            RETVALUE(ROKDNA);
+            return (ROKDNA);
          }
 
 #ifdef CMINETDBG
@@ -10852,9 +10852,9 @@ S32              flags;         /* additional control flags */
          if (INET_ERR_CODE == ERR_CONNABORTED)
          {
             *len = 0;
-            RETVALUE(RCLOSED);
+            return (RCLOSED);
          }
-         RETVALUE(RFAILED); 
+         return RFAILED; 
       }/* if ((recvLen == INET_ERR) || (recvLen > CM_INET_MAX_MSG_LEN))*/ 
 
       if(recvLen < curLen)
@@ -10870,7 +10870,7 @@ S32              flags;         /* additional control flags */
 #endif /* WIN32 | CMINETFLATBUF  */
 
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of cmInetFlushRecvBuf */
 
 #endif /* CM_INET_FLUSH_RECV_BUF*/