RLC BO, BO response and DL Data handling. [Issue-ID: ODUHIGH-181]

[o-du/l2.git] / src / mt / ss_gen.c

diff --git a/src/mt/ss_gen.c b/src/mt/ss_gen.c
index 1870b44..ed0dfac 100644 (file)
--- a/src/mt/ss_gen.c
+++ b/src/mt/ss_gen.c
@@ -110,9 +110,9 @@
 
 /*ss014.301: SSI-4GMX related changes*/
 #ifdef SS_4GMX_LCORE
-PUBLIC VOLATILE SsOs     osCp;           /* common OS control point */
+VOLATILE SsOs     osCp;           /* common OS control point */
 #else
-PUBLIC SsOs     osCp;           /* common OS control point */
+SsOs     osCp;           /* common OS control point */
 #endif
 
  
@@ -132,17 +132,17 @@ PRIVATE S16 SULockOsCp ARGS((Void));
 #ifdef SSI_STATIC_MEM_LEAK_DETECTION
 PRIVATE void InitializeForStaticMemLeak ARGS((void));
 PRIVATE void InitializeStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo));
-PUBLIC U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
-PUBLIC void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo* memAllocInfo,U32 size, char*
+U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
+void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo* memAllocInfo,U32 size, char*
       file, U32 line));
-PUBLIC void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* file,
+void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* file,
       U32 line, U32 size, void* ptr, U32 idx));
 PRIVATE void PrintStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo, FILE
       *opFile));
 #endif
 /* ss001.301: additions */
 
-PUBLIC void DumpSSIDemandQDebugInformation()
+void DumpSSIDemandQDebugInformation()
 {
    U32 i,j;
    RTLIN_DUMP_DEBUG("Demand Q Information\n");
@@ -165,7 +165,7 @@ PUBLIC void DumpSSIDemandQDebugInformation()
 #ifdef TENB_T2K3K_SPECIFIC_CHANGES
 pthread_mutex_t dumpingLock = PTHREAD_MUTEX_INITIALIZER;
 
-PUBLIC Void mtSigSegvHndlr()
+Void mtSigSegvHndlr()
 {
    int i;
 
@@ -183,7 +183,7 @@ PUBLIC Void mtSigSegvHndlr()
    sleep(5);
 }
 
-PUBLIC Void mtSigUsr2Hndlr()
+Void mtSigUsr2Hndlr()
 {
    printf("Backtrace for thread Id (%lu) cause:SIGUSR2(%d)\n",(unsigned long) pthread_self(),SIGUSR2);   
 
@@ -217,12 +217,12 @@ PUBLIC Void mtSigUsr2Hndlr()
 *
 */
 #ifdef ANSI
-PUBLIC S16 SInit
+S16 SInit
 (
 void
 )
 #else
-PUBLIC S16 SInit()
+S16 SInit()
 #endif
 {
    S16 ret;
@@ -276,7 +276,7 @@ PUBLIC S16 SInit()
          sprintf(prntBufLoc,"\n SInit(): ssdInitGen failed to initialize\
                                                                implementation specific general information \n");
       SDisplay(1,prntBufLoc);
-      RETVALUE(RFAILED);
+      return RFAILED;
        }
  
 #ifdef SSI_STATIC_MEM_LEAK_DETECTION
@@ -667,7 +667,7 @@ PUBLIC S16 SInit()
    ssdStart();
 
 
-   RETVALUE(ROK);
+   return ROK;
 
 
 /* clean up code */
@@ -724,7 +724,7 @@ cleanup0:
    ssdDeinitGen();
 
 
-   RETVALUE(RFAILED);
+   return RFAILED;
 }
 
 \f
@@ -745,12 +745,12 @@ cleanup0:
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeInit
+S16 SDeInit
 (
 void
 )
 #else
-PUBLIC S16 SDeInit()
+S16 SDeInit()
 #endif
 {
   /* ss007.301 */
@@ -774,7 +774,7 @@ PUBLIC S16 SDeInit()
 #if (ERRCLASS & ERRCLS_DEBUG)
     SSLOGERROR(ERRCLS_DEBUG, ESS014, ERRZERO,
                       "Could not destroy the Semaphore");
-    RETVALUE(RFAILED);
+    return RFAILED;
 
 #endif
    }
@@ -786,7 +786,7 @@ PUBLIC S16 SDeInit()
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS015, ERRZERO,
                       "Could not destroy the Semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 
 #endif
    }
@@ -803,18 +803,18 @@ PUBLIC S16 SDeInit()
    SDestroyLock(&(osCp.logger.bufLock));
 #endif /* SS_LOGGER_SUPPORT */
    ssdDeinitLog();
-   RETVALUE(ROK);
+   return ROK;
 
 }
 /* ss001.301: additions */
 #ifdef SS_LOGGER_SUPPORT 
 #ifdef ANSI
-PUBLIC S16 SWrtLogBuf
+S16 SWrtLogBuf
 (
 Txt *buf                        /* buffer */
 )
 #else
-PUBLIC S16 SWrtLogBuf(buf)
+S16 SWrtLogBuf(buf)
 Txt *buf;                       /* buffer */
 #endif
 {
@@ -826,7 +826,7 @@ Txt *buf;                       /* buffer */
    if(osCp.logger.started == FALSE)
    {
       (Void)SUnlock(&(osCp.logger.bufLock));
-      RETVALUE(ROK);
+      return ROK;
    }
    /*
     * Append the buffer to the global buffer
@@ -846,7 +846,7 @@ Txt *buf;                       /* buffer */
       osCp.logger.curBufSiz += bufSz;
    }
    (Void)SUnlock(&(osCp.logger.bufLock));
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif /* SS_LOGGER_SUPPORT  */
 /*
@@ -871,12 +871,12 @@ Txt *buf;                       /* buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SPrint
+S16 SPrint
 (
 Txt *buf                        /* buffer */
 )
 #else
-PUBLIC S16 SPrint(buf)
+S16 SPrint(buf)
 Txt *buf;                       /* buffer */
 #endif
 {
@@ -888,7 +888,7 @@ Txt *buf;                       /* buffer */
    SWrtLogBuf(buf);
 #endif /* SS_LOGGER_SUPPORT  */
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of SPrint */
 
@@ -909,13 +909,13 @@ Txt *buf;                       /* buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SError
+S16 SError
 (
 Seq seq,                    /* sequence */
 Reason reason               /* reason */
 )
 #else
-PUBLIC S16 SError(seq, reason)
+S16 SError(seq, reason)
 Seq seq;                    /* sequence */
 Reason reason;              /* reason */
 #endif
@@ -938,7 +938,7 @@ Reason reason;              /* reason */
    ret = ssdError(seq, reason);
 
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 \f
@@ -956,7 +956,7 @@ Reason reason;              /* reason */
 *
 */
 #ifdef ANSI
-PUBLIC Void SLogError
+Void SLogError
 (
 Ent ent,                    /* Calling layer's entity id */
 Inst inst,                  /* Calling layer's instance id */
@@ -969,7 +969,7 @@ ErrVal errVal,              /* error value */
 Txt *errDesc                /* description of error */
 )
 #else
-PUBLIC Void SLogError(ent, inst, procId, file, line,
+Void SLogError(ent, inst, procId, file, line,
                         errCls, errCode, errVal, errDesc)
 Ent ent;                    /* Calling layer's entity id */
 Inst inst;                  /* Calling layer's instance id */
@@ -1027,17 +1027,17 @@ Txt *errDesc;               /* description of error */
 *
 */
 #ifdef ANSI
-PUBLIC ProcId SFndProcId
+ProcId SFndProcId
 (
 void
 )
 #else
-PUBLIC ProcId SFndProcId()
+ProcId SFndProcId()
 #endif
 {
    TRC1(SFndProcId);
 
-   RETVALUE(osCp.procId);
+   return (osCp.procId);
 } /* end of SFndProcId */
 
 \f
@@ -1055,12 +1055,12 @@ PUBLIC ProcId SFndProcId()
 *
 */
 #ifdef ANSI
-PUBLIC Void SSetProcId
+Void SSetProcId
 (
 ProcId procId
 )
 #else
-PUBLIC Void SSetProcId(procId)
+Void SSetProcId(procId)
 ProcId procId;
 #endif
 {
@@ -1090,12 +1090,12 @@ ProcId procId;
 *
 */
 #ifdef ANSI
-PUBLIC U16 SGetProcIdIdx
+U16 SGetProcIdIdx
 (
 ProcId proc
 )
 #else
-PUBLIC U16 SGetProcIdIdx(proc)
+U16 SGetProcIdIdx(proc)
 ProcId proc; 
 #endif
 {
@@ -1115,7 +1115,7 @@ ProcId proc;
       if (osCp.procLst.procId[i] == proc)
          return i;
 
-   RETVALUE(SS_INV_PROCID_IDX);
+   return (SS_INV_PROCID_IDX);
 } /* SGetProcIdIdx */
 
 \f
@@ -1154,7 +1154,7 @@ ProcId proc;
       {
          osCp.procLst.procId[i] = proc;
          osCp.procLst.free--;
-         RETVALUE(ROK);
+         return ROK;
       }
 
    /* search for free entry upto idx */
@@ -1163,10 +1163,10 @@ ProcId proc;
       {
          osCp.procLst.procId[i] = proc;
          osCp.procLst.free--;
-         RETVALUE(ROK);
+         return ROK;
       }
 
-   RETVALUE(RFAILED);
+   return RFAILED;
 } /* SInsProcId */
 
 \f
@@ -1205,7 +1205,7 @@ ProcId proc;
       {
          osCp.procLst.procId[i] = SS_INV_PROCID;
          osCp.procLst.free++;
-         RETVALUE(ROK);
+         return ROK;
       }
 
    /* search upto idx */
@@ -1214,10 +1214,10 @@ ProcId proc;
       {
          osCp.procLst.procId[i] = SS_INV_PROCID;
          osCp.procLst.free++;
-         RETVALUE(ROK);
+         return ROK;
       }
 
-   RETVALUE(RFAILED);
+   return RFAILED;
 } /* SRemProcId */
 
 \f
@@ -1252,7 +1252,7 @@ PRIVATE S16 SLockOsCp(Void)
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS016, ERRZERO,
                      "Could not lock system task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret);
@@ -1269,14 +1269,14 @@ PRIVATE S16 SLockOsCp(Void)
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS018, ERRZERO,
                       "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* SLockOsCp */
 
@@ -1313,11 +1313,11 @@ PRIVATE S16 SULockOsCp(Void)
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS019, ERRZERO,
                       "Could not give the Semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* SULockOsCp */
 
@@ -1337,13 +1337,13 @@ PRIVATE S16 SULockOsCp(Void)
 *
 */
 #ifdef ANSI
-PUBLIC S16 SAddProcIdLst
+S16 SAddProcIdLst
 (
 U16 numPIds,
 ProcId *pIdLst
 )
 #else
-PUBLIC S16 SAddProcIdLst(numPIds, pIdLst)
+S16 SAddProcIdLst(numPIds, pIdLst)
 U16 numPIds;
 ProcId *pIdLst;
 #endif
@@ -1359,7 +1359,7 @@ ProcId *pIdLst;
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS020, ERRZERO, "number of proc Ids exceeds\
  limit");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* find if the entry exist in the table */
@@ -1368,14 +1368,14 @@ ProcId *pIdLst;
       if (pIdLst[i] == SS_INV_PROCID)
       {
          SSLOGERROR(ERRCLS_INT_PAR, ESS021, ERRZERO, "Invalid proc Ids");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
 #endif
    
    if (SLockOsCp() != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    for (i = 0; i < numPIds; i++)
@@ -1383,7 +1383,7 @@ ProcId *pIdLst;
       {
          SSLOGERROR(ERRCLS_INT_PAR, ESS022, ERRZERO, "Duplicate proc id");
          (Void) SULockOsCp();
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
    if (numPIds > osCp.procLst.free)
@@ -1391,7 +1391,7 @@ ProcId *pIdLst;
       SSLOGERROR(ERRCLS_INT_PAR, ESS023, ERRZERO, "Total number of proc id \
 exceeds");
       (Void) SULockOsCp();
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif 
 
@@ -1407,15 +1407,15 @@ exceeds");
                       "Could not insert the proc id");
 #endif
          (Void) SULockOsCp();
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
    /* unlock the table */
    if (SULockOsCp() != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
-   RETVALUE(ret);
+   return (ret);
 } /* SAddProcIdLst */
 
 \f
@@ -1433,13 +1433,13 @@ exceeds");
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRemProcIdLst
+S16 SRemProcIdLst
 (
 U16 numPIds,
 ProcId *pIdLst
 )
 #else
-PUBLIC S16 SRemProcIdLst(numPIds, pIdLst)
+S16 SRemProcIdLst(numPIds, pIdLst)
 U16 numPIds;
 ProcId *pIdLst;
 #endif
@@ -1451,16 +1451,16 @@ ProcId *pIdLst;
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* range check */
    if (numPIds > SS_MAX_PROCS)
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
 
    if (SLockOsCp() != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
    if (numPIds > (SS_MAX_PROCS - osCp.procLst.free))
    {
       (Void) SULockOsCp();
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* find if the entry exist in the table */
@@ -1469,7 +1469,7 @@ ProcId *pIdLst;
       if (SGetProcIdIdx(pIdLst[i]) == SS_INV_PROCID_IDX)
       {
          (Void) SULockOsCp();
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -1478,9 +1478,9 @@ ProcId *pIdLst;
       SRemProcId(pIdLst[i]);
 
    if (SULockOsCp() != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SRemProcIdLst */
 
 \f
@@ -1498,13 +1498,13 @@ ProcId *pIdLst;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetProcIdLst
+S16 SGetProcIdLst
 (
 U16 *numPIds,
 ProcId *pIdLst
 )
 #else
-PUBLIC S16 SGetProcIdLst(numPIds, pIdLst)
+S16 SGetProcIdLst(numPIds, pIdLst)
 U16 *numPIds;
 ProcId *pIdLst;
 #endif
@@ -1518,12 +1518,12 @@ ProcId *pIdLst;
    if ((numPIds == NULLP) || (pIdLst == NULLP))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS025, ERRZERO, "Invalid numPIds/pIdLst");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif 
 
    if (SLockOsCp() != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
    for (i = 0; i < SS_MAX_PROCS; i++)
    {
@@ -1534,12 +1534,12 @@ ProcId *pIdLst;
    *numPIds = count;
 
    if (SULockOsCp() != ROK)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
    if (count == 0)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SGetProcIdLst */
 
 \f
@@ -1558,7 +1558,7 @@ ProcId *pIdLst;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetXxCb
+S16 SGetXxCb
 (
 ProcId proc,
 Ent ent,
@@ -1566,7 +1566,7 @@ Inst inst,
 Void **xxCb
 )
 #else
-PUBLIC S16 SGetXxCb(proc, ent, inst, xxCb)
+S16 SGetXxCb(proc, ent, inst, xxCb)
 ProcId proc;
 Ent ent;
 Inst inst;
@@ -1582,7 +1582,7 @@ Void **xxCb;
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS026, ERRZERO, "Invalid proc/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif 
    
@@ -1598,22 +1598,22 @@ Void **xxCb;
 #if (ERRCLASS & ERRCLS_INT_PAR)
       SSLOGERROR(ERRCLS_INT_PAR, ESS027, ERRZERO, "Could not get proc table idx");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    idx = osCp.tTskIds[procIdIdx][ent][inst];
    if (idx == SS_TSKNC)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* update the CB */
    *xxCb = osCp.tTskTbl[idx].xxCb;
    /*ss032.103 added a check for NULLP */
    if (*xxCb == NULLP)
-      RETVALUE(RFAILED);
+      return RFAILED;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SGetXxCb */
 
 #endif /* SS_MULTIPLE_PROCS */
@@ -1636,12 +1636,12 @@ Void **xxCb;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SFillEntIds
+S16 SFillEntIds
 (
 Void
 )
 #else
-PUBLIC S16 SFillEntIds(Void)
+S16 SFillEntIds(Void)
 #endif
 {
 
@@ -1712,7 +1712,7 @@ PUBLIC S16 SFillEntIds(Void)
                               W      X      Y      Z */
                            {ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC,
                   /* K */   ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC,
-                            ENTKW, ENTNC, ENTNC, ENTNC},
+                            ENTRLC, ENTNC, ENTNC, ENTNC},
                            /* A      B      C      D      E      F      G      H      I      J      K  *
                               L      M      N      O      P      Q      R      S      T      U      V  *
                               W      X      Y      Z */
@@ -1809,7 +1809,7 @@ PUBLIC S16 SFillEntIds(Void)
    TRC2(SFillEntIds)
             memcpy((U8*)osCp.entId, (U8*)entInfo, sizeof(entInfo));
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SFillEntIds */
 
 
@@ -1829,13 +1829,13 @@ PUBLIC S16 SFillEntIds(Void)
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetEntInd 
+S16 SGetEntInd 
 (
 Ent      *entId,
 U8       *fileName
 )
 #else
-PUBLIC S16 SGetEntInd(entId, fileName)
+S16 SGetEntInd(entId, fileName)
 Ent      *entId;
 U8       *fileName;
 #endif
@@ -1877,7 +1877,7 @@ U8       *fileName;
                     if (letter[1] == 'g' && letter[2] == 'u')
                     {
                        *entId = ENTGT;
-                            RETVALUE(ROK);
+                            return ROK;
                     }
                   default: 
                             break;
@@ -1897,7 +1897,7 @@ U8       *fileName;
            if(letter[count] < 'a' || letter[count] > 'z')
            {
                   *entId = ENTNC;
-                  RETVALUE(ROK);
+                  return ROK;
            }
            else
            {
@@ -1915,7 +1915,7 @@ U8       *fileName;
        /* First two letter of file name are alphabets the get the 
         * entity id from the static data base which is loaded in sFillEntIds() */
        *entId = osCp.entId[firstIdx][secondIdx];
-       RETVALUE(ROK);
+       return ROK;
 } /* SGetEntInd */
 
 #endif /* SS_HISTOGRAM_SUPPORT */
@@ -1935,14 +1935,14 @@ U8       *fileName;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SLockNew 
+S16 SLockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 
 )
 #else
-PUBLIC S16 SLockNew(lockId, lockType)
+S16 SLockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
@@ -1954,9 +1954,9 @@ U8         lockType;
   if((retVal = ssdLockNew(lockId, lockType)) != ROK) 
   {
     SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SLockNew(): Failed to aquire the lock\n");
-    RETVALUE(RFAILED);
+    return RFAILED;
   }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -1973,13 +1973,13 @@ U8         lockType;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SInitLockNew 
+S16 SInitLockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 )
 #else
-PUBLIC S16 SInitLockNew(lockId, lockType)
+S16 SInitLockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
@@ -1991,9 +1991,9 @@ U8         lockType;
   if((retVal = ssdInitLockNew(lockId, lockType)) != ROK) 
   {
     SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SInitLockNew(): Initialization of lock Failed\n");
-    RETVALUE(RFAILED);
+    return RFAILED;
   }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -2010,13 +2010,13 @@ U8         lockType;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SUnlockNew 
+S16 SUnlockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 )
 #else
-PUBLIC S16 SUnlockNew(lockId, lockType)
+S16 SUnlockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
@@ -2028,9 +2028,9 @@ U8         lockType;
   if((retVal = ssdUnlockNew(lockId, lockType)) != ROK) 
   {
     SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SUnlockNew(): Failed to release the lock\n");
-    RETVALUE(RFAILED);
+    return RFAILED;
   }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -2047,13 +2047,13 @@ U8         lockType;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDestroyLockNew 
+S16 SDestroyLockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 )
 #else
-PUBLIC S16 SDestroyLockNew(lockId, lockType)
+S16 SDestroyLockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
@@ -2065,9 +2065,9 @@ U8         lockType;
   if((retVal = ssdDestroyLockNew(lockId, lockType)) != ROK) 
   {
     SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SDestroyLockNew(): Failed to destroy the lock\n");
-    RETVALUE(RFAILED);
+    return RFAILED;
   }
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif /* SS_LOCK_SUPPORT */
 
@@ -2206,7 +2206,7 @@ void InitializeForStaticMemLeak()
    }
 }
 
-PUBLIC void DumpStaticMemLeakFiles()
+void DumpStaticMemLeakFiles()
 {
    int i;
 
@@ -2233,12 +2233,12 @@ PUBLIC void DumpStaticMemLeakFiles()
  *
  */
 #ifdef ANSI
-PUBLIC S16 SReInitTmr
+S16 SReInitTmr
 (
 void
 )
 #else
-PUBLIC S16 SReInitTmr()
+S16 SReInitTmr()
 #endif
 {
    U8 ret = ROK;
@@ -2251,9 +2251,9 @@ PUBLIC S16 SReInitTmr()
    {
        /*ss012.301 : Fix log related issue to suite MT and NS implementations*/
     SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SReInitTmr(): Failed to Restart the Tmr\n");
-    RETVALUE(RFAILED);
+    return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -2269,7 +2269,7 @@ PUBLIC S16 SReInitTmr()
  *       File: ss_gen.c
  *
  */
-PUBLIC S8* SGetConfigPath(Void)
+S8* SGetConfigPath(Void)
 {
    return osCp.configFilePath;
 }