quieting clang-tidy, non-functional changes

mdavidsaver · mdavidsaver · commit 90c5ee8cb0df · 2023-06-13T14:17:03.000-07:00
Changes to syntax which should not effect generated code
diff --git a/modules/libcom/src/as/asLibRoutines.c b/modules/libcom/src/as/asLibRoutines.c
@@ -359,7 +359,6 @@ void epicsStdCall asPutMemberPvt(ASMEMBERPVT asMemberPvt,void *userPvt)
     if(!asActive) return;
     if(!pasgmember) return;
     pasgmember->userPvt = userPvt;
-    return;
 }
 
 long epicsStdCall asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt,
diff --git a/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp b/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
@@ -25,8 +25,8 @@
 
 namespace {
 
-static epicsThreadOnceId epicsSigletonOnceFlag ( EPICS_THREAD_ONCE_INIT );
-static epicsMutex * pEPICSSigletonMutex = 0;
+epicsThreadOnceId epicsSigletonOnceFlag ( EPICS_THREAD_ONCE_INIT );
+epicsMutex * pEPICSSigletonMutex = 0;
 
 extern "C" void SingletonMutexOnce ( void * /* pParm */ )
 {
diff --git a/modules/libcom/src/ellLib/ellLib.c b/modules/libcom/src/ellLib/ellLib.c
@@ -34,8 +34,6 @@ void ellAdd (ELLLIST *pList, ELLNODE *pNode)
 
     pList->node.previous = pNode;
     pList->count++;
-
-    return;
 }
 /****************************************************************************
  *
@@ -65,8 +63,6 @@ void ellConcat (ELLLIST *pDstList, ELLLIST *pAddList)
     pAddList->count = 0;
     pAddList->node.next = NULL;
     pAddList->node.previous = NULL;
-
-    return;
 }
 /****************************************************************************
  *
@@ -86,8 +82,6 @@ void ellDelete (ELLLIST *pList, ELLNODE *pNode)
         pNode->previous->next = pNode->next;
 
     pList->count--;
-
-    return;
 }
 /****************************************************************************
  *
@@ -136,8 +130,6 @@ void ellExtract (ELLLIST *pSrcList, ELLNODE *pStartNode, ELLNODE *pEndNode, ELLL
     }
     pSrcList->count -= count;
     pDstList->count += count;
-
-    return;
 }
 /****************************************************************************
  *
@@ -194,8 +186,6 @@ void ellInsert (ELLLIST *plist, ELLNODE *pPrev, ELLNODE *pNode)
         pNode->next->previous = pNode;
 
     plist->count++;
-
-    return;
 }
 /****************************************************************************
  *
diff --git a/modules/libcom/src/error/errSymLib.c b/modules/libcom/src/error/errSymLib.c
@@ -260,7 +260,6 @@ void errSymTestPrint(long errNum)
     if ( message[0] == '\0' ) return;
     printf("module %hu number %hu message=\"%s\"\n",
         modnum, errnum, message);
-    return;
 }
 
 /****************************************************************
diff --git a/modules/libcom/src/fdmgr/fdManager.cpp b/modules/libcom/src/fdmgr/fdManager.cpp
@@ -222,7 +222,6 @@ LIBCOM_API void fdManager::process (double delay)
         this->pTimerQueue->process(epicsTime::getCurrent());
     }
     this->processInProg = false;
-    return;
 }
 
 //
diff --git a/modules/libcom/src/fdmgr/fdmgr.cpp b/modules/libcom/src/fdmgr/fdmgr.cpp
@@ -39,8 +39,8 @@ class fdRegForOldFdmgr : public fdReg {
     //
     class noFunctionSpecified {};
 
-    LIBCOM_API fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType type, 
-        const bool onceOnly, fdManager &manager, pCallBackFDMgr pFunc, void *pParam);
+    LIBCOM_API fdRegForOldFdmgr (SOCKET fdIn, fdRegType type,
+        bool onceOnly, fdManager &manager, pCallBackFDMgr pFunc, void *pParam);
     LIBCOM_API ~fdRegForOldFdmgr ();
 
 private:
diff --git a/modules/libcom/src/freeList/freeListLib.c b/modules/libcom/src/freeList/freeListLib.c
@@ -83,7 +83,6 @@ LIBCOM_API void epicsStdCall
     pfl->lock = epicsMutexMustCreate();
     *ppvt = (void *)pfl;
     VALGRIND_CREATE_MEMPOOL(pfl, REDZONE, 0);
-    return;
 }
 
 LIBCOM_API void * epicsStdCall freeListCalloc(void *pvt)
diff --git a/modules/libcom/src/gpHash/gpHashLib.c b/modules/libcom/src/gpHash/gpHashLib.c
@@ -56,7 +56,6 @@ void epicsStdCall gphInitPvt(gphPvt **ppvt, int size)
     pgphPvt->paplist = callocMustSucceed(size, sizeof(ELLLIST *), "gphInitPvt");
     pgphPvt->lock = epicsMutexMustCreate();
     *ppvt = pgphPvt;
-    return;
 }
 
 GPHENTRY * epicsStdCall gphFindParse(gphPvt *pgphPvt, const char *name, size_t len, void *pvtid)
@@ -171,7 +170,6 @@ void epicsStdCall gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
     }
 
     epicsMutexUnlock(pgphPvt->lock);
-    return;
 }
 
 void epicsStdCall gphFreeMem(gphPvt *pgphPvt)
diff --git a/modules/libcom/src/log/iocLogServer.c b/modules/libcom/src/log/iocLogServer.c
@@ -706,8 +706,6 @@ static void freeLogClient(struct iocLogClient     *pclient)
     epicsSocketDestroy ( pclient->insock );
 
     free (pclient);
-
-    return;
 }
 
 
diff --git a/modules/libcom/src/log/logClient.c b/modules/libcom/src/log/logClient.c
@@ -559,7 +559,7 @@ void epicsStdCall iocLogPrefix(const char * prefix)
 
     if (logClientPrefix) {
         /* No error message if the new prefix is identical to the old one */
-        if (strcmp(logClientPrefix, prefix))
+        if (strcmp(logClientPrefix, prefix)!=0)
             printf (ERL_WARNING " iocLogPrefix: The prefix was already set to "
                 "\"%s\" and can't be changed.\n", logClientPrefix);
         return;
diff --git a/modules/libcom/src/macLib/macCore.c b/modules/libcom/src/macLib/macCore.c
@@ -72,7 +72,7 @@ static void       trans ( MAC_HANDLE *handle, MAC_ENTRY *entry, int level,
 static void       refer ( MAC_HANDLE *handle, MAC_ENTRY *entry, int level,
                           const char **rawval, char **value, char *valend );
 
-static void cpy2val( const char *src, char **value, char *valend );
+static void cpy2val( const char *src, char **value, const char *valend );
 static char *Strdup( const char *string );
 
 
@@ -763,8 +763,6 @@ static void trans( MAC_HANDLE *handle, MAC_ENTRY *entry, int level,
        still there to be seen) */
     *rawval = ( *r == '\0' ) ? r - 1 : r;
     *value  = v;
-
-    return;
 }
 
 /*
@@ -925,14 +923,13 @@ static void refer ( MAC_HANDLE *handle, MAC_ENTRY *entry, int level,
 
     *rawval = r;
     *value = v;
-    return;
 }
 
 /*
  * Copy a string, honoring the 'end of destination string' pointer
  * Returns with **value pointing to the '\0' terminator
  */
-static void cpy2val(const char *src, char **value, char *valend)
+static void cpy2val(const char *src, char **value, const char *valend)
 {
     char *v = *value;
     while ((v < valend) && (*v = *src++)) { v++; }
diff --git a/modules/libcom/src/misc/aToIPAddr.c b/modules/libcom/src/misc/aToIPAddr.c
@@ -15,13 +15,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "dbDefs.h"
 #include "epicsTypes.h"
 #include "osiSock.h"
 
-#ifndef NELEMENTS
-#define NELEMENTS(A) (sizeof(A)/sizeof(A[0]))
-#endif /*NELEMENTS*/
-
 /*
  * addrArrayToUL ()
  */
diff --git a/modules/libcom/src/osi/devLibVME.c b/modules/libcom/src/osi/devLibVME.c
@@ -503,7 +503,7 @@ long devUnregisterAddress(
         return S_dev_addressNotFound;
     }
 
-    if (strcmp(pOwnerName,pRange->pOwnerName)) {
+    if (strcmp(pOwnerName,pRange->pOwnerName)!=0) {
         s = S_dev_addressOverlap;
         errPrintf (
             s,
diff --git a/modules/libcom/src/osi/epicsThread.cpp b/modules/libcom/src/osi/epicsThread.cpp
@@ -282,18 +282,12 @@ void epicsThread::setPriority (unsigned int priority) throw ()
 
 bool epicsThread::priorityIsEqual (const epicsThread &otherThread) const throw ()
 {
-    if ( epicsThreadIsEqual (this->id, otherThread.id) ) {
-        return true;
-    }
-    return false;
+    return epicsThreadIsEqual (this->id, otherThread.id)!=0;
 }
 
 bool epicsThread::isSuspended () const throw ()
 {
-    if ( epicsThreadIsSuspended (this->id) ) {
-        return true;
-    }
-    return false;
+    return epicsThreadIsSuspended (this->id)!=0;
 }
 
 bool epicsThread::operator == (const epicsThread &rhs) const throw ()
diff --git a/modules/libcom/src/osi/epicsTime.cpp b/modules/libcom/src/osi/epicsTime.cpp
@@ -44,8 +44,9 @@ void epicsTime::throwError(int code)
 }
 
 
-epicsTime::epicsTime ( const epicsTimeStamp & replace ) {
-    ts = replace;
+epicsTime::epicsTime ( const epicsTimeStamp & replace )
+    :ts(replace)
+{
     if(ts.nsec >= nSecPerSec)
         throw std::logic_error("epicsTimeStamp has overflow in nano-seconds field");
 }
diff --git a/modules/libcom/src/osi/os/Linux/osdThreadExtra.c b/modules/libcom/src/osi/os/Linux/osdThreadExtra.c
@@ -60,7 +60,7 @@ static void thread_hook(epicsThreadId pthreadInfo)
     /* Set the name of the thread's process. Limited to 16 characters. */
     char comm[16];
 
-    if (strcmp(pthreadInfo->name, "_main_")) {
+    if (strcmp(pthreadInfo->name, "_main_") != 0) {
         snprintf(comm, sizeof(comm), "%s", pthreadInfo->name);
         prctl(PR_SET_NAME, comm, 0l, 0l, 0l);
     }
diff --git a/modules/libcom/src/osi/osiSock.c b/modules/libcom/src/osi/osiSock.c
@@ -25,7 +25,7 @@
 #define nDigitsDottedIP 4u
 #define chunkSize 8u
 
-#define makeMask(NBITS) ( ( 1u << ( (unsigned) NBITS) ) - 1u )
+#define makeMask(NBITS) ( ( 1u << ( (unsigned) (NBITS)) ) - 1u )
 
 /*
  * sockAddrAreIdentical()
diff --git a/modules/libcom/src/timer/epicsTimer.cpp b/modules/libcom/src/timer/epicsTimer.cpp
@@ -210,7 +210,7 @@ extern "C" epicsTimerQueueId epicsStdCall
         epicsSingleton < timerQueueActiveMgr > :: reference ref =
             timerQueueMgrEPICS.getReference ();
         epicsTimerQueueActiveForC & tmr =
-            ref->allocate ( ref, okToShare ? true : false, threadPriority );
+            ref->allocate ( ref, okToShare != 0, threadPriority );
         return &tmr;
     }
     catch ( ... ) {

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,6 @@ void epicsStdCall asPutMemberPvt(ASMEMBERPVT asMemberPvt,void *userPvt)`
`359`	`359`	`if(!asActive) return;`
`360`	`360`	`if(!pasgmember) return;`
`361`	`361`	`pasgmember->userPvt = userPvt;`
`362`		`- return;`
`363`	`362`	`}`
`364`	`363`
`365`	`364`	`long epicsStdCall asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt,`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`
`26`	`26`	`namespace {`
`27`	`27`
`28`		`-static epicsThreadOnceId epicsSigletonOnceFlag ( EPICS_THREAD_ONCE_INIT );`
`29`		`-static epicsMutex * pEPICSSigletonMutex = 0;`
	`28`	`+epicsThreadOnceId epicsSigletonOnceFlag ( EPICS_THREAD_ONCE_INIT );`
	`29`	`+epicsMutex * pEPICSSigletonMutex = 0;`
`30`	`30`
`31`	`31`	`extern "C" void SingletonMutexOnce ( void * /* pParm */ )`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ void ellAdd (ELLLIST pList, ELLNODE pNode)`
`34`	`34`
`35`	`35`	`pList->node.previous = pNode;`
`36`	`36`	`pList->count++;`
`37`		`-`
`38`		`- return;`
`39`	`37`	`}`
`40`	`38`	`/****************************************************************************`
`41`	`39`	`*`
`@@ -65,8 +63,6 @@ void ellConcat (ELLLIST pDstList, ELLLIST pAddList)`
`65`	`63`	`pAddList->count = 0;`
`66`	`64`	`pAddList->node.next = NULL;`
`67`	`65`	`pAddList->node.previous = NULL;`
`68`		`-`
`69`		`- return;`
`70`	`66`	`}`
`71`	`67`	`/****************************************************************************`
`72`	`68`	`*`
`@@ -86,8 +82,6 @@ void ellDelete (ELLLIST pList, ELLNODE pNode)`
`86`	`82`	`pNode->previous->next = pNode->next;`
`87`	`83`
`88`	`84`	`pList->count--;`
`89`		`-`
`90`		`- return;`
`91`	`85`	`}`
`92`	`86`	`/****************************************************************************`
`93`	`87`	`*`
`@@ -136,8 +130,6 @@ void ellExtract (ELLLIST pSrcList, ELLNODE pStartNode, ELLNODE *pEndNode, ELLL`
`136`	`130`	`}`
`137`	`131`	`pSrcList->count -= count;`
`138`	`132`	`pDstList->count += count;`
`139`		`-`
`140`		`- return;`
`141`	`133`	`}`
`142`	`134`	`/****************************************************************************`
`143`	`135`	`*`
`@@ -194,8 +186,6 @@ void ellInsert (ELLLIST plist, ELLNODE pPrev, ELLNODE *pNode)`
`194`	`186`	`pNode->next->previous = pNode;`
`195`	`187`
`196`	`188`	`plist->count++;`
`197`		`-`
`198`		`- return;`
`199`	`189`	`}`
`200`	`190`	`/****************************************************************************`
`201`	`191`	`*`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,6 @@ void errSymTestPrint(long errNum)`
`260`	`260`	`if ( message[0] == '\0' ) return;`
`261`	`261`	`printf("module %hu number %hu message=\"%s\"\n",`
`262`	`262`	`modnum, errnum, message);`
`263`		`- return;`
`264`	`263`	`}`
`265`	`264`
`266`	`265`	`/****************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,6 @@ LIBCOM_API void fdManager::process (double delay)`
`222`	`222`	`this->pTimerQueue->process(epicsTime::getCurrent());`
`223`	`223`	`}`
`224`	`224`	`this->processInProg = false;`
`225`		`- return;`
`226`	`225`	`}`
`227`	`226`
`228`	`227`	`//`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ LIBCOM_API void epicsStdCall`
`83`	`83`	`pfl->lock = epicsMutexMustCreate();`
`84`	`84`	`ppvt = (void )pfl;`
`85`	`85`	`VALGRIND_CREATE_MEMPOOL(pfl, REDZONE, 0);`
`86`		`- return;`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`LIBCOM_API void * epicsStdCall freeListCalloc(void *pvt)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ void epicsStdCall gphInitPvt(gphPvt **ppvt, int size)`
`56`	`56`	`pgphPvt->paplist = callocMustSucceed(size, sizeof(ELLLIST *), "gphInitPvt");`
`57`	`57`	`pgphPvt->lock = epicsMutexMustCreate();`
`58`	`58`	`*ppvt = pgphPvt;`
`59`		`- return;`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`GPHENTRY * epicsStdCall gphFindParse(gphPvt pgphPvt, const char name, size_t len, void *pvtid)`
`@@ -171,7 +170,6 @@ void epicsStdCall gphDelete(gphPvt pgphPvt, const char name, void *pvtid)`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`epicsMutexUnlock(pgphPvt->lock);`
`174`		`- return;`
`175`	`173`	`}`
`176`	`174`
`177`	`175`	`void epicsStdCall gphFreeMem(gphPvt *pgphPvt)`
Original file line number	Diff line number	Diff line change
`@@ -706,8 +706,6 @@ static void freeLogClient(struct iocLogClient *pclient)`
`706`	`706`	`epicsSocketDestroy ( pclient->insock );`
`707`	`707`
`708`	`708`	`free (pclient);`
`709`		`-`
`710`		`- return;`
`711`	`709`	`}`
`712`	`710`
`713`	`711`