From dd67086dc982566d98fbdae2c5f97bc2e3c059a8 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 21 Aug 2002 16:31:37 +0000 Subject: [PATCH] use bool for boolean variable --- src/cas/generic/casAsyncIOI.cc | 9 +++------ src/cas/generic/casDGClient.cc | 4 ++-- src/cas/generic/casInternal.h | 18 +++++++++--------- src/cas/generic/casStrmClient.cc | 10 +++++----- src/cas/generic/server.h | 2 +- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/cas/generic/casAsyncIOI.cc b/src/cas/generic/casAsyncIOI.cc index 07095ac64..9a792da19 100644 --- a/src/cas/generic/casAsyncIOI.cc +++ b/src/cas/generic/casAsyncIOI.cc @@ -25,12 +25,9 @@ // // casAsyncIOI::casAsyncIOI() // -casAsyncIOI::casAsyncIOI (casCoreClient &clientIn) : - client (clientIn), - inTheEventQueue (FALSE), - posted (FALSE), - ioComplete (FALSE), - serverDelete (FALSE) +casAsyncIOI::casAsyncIOI ( casCoreClient & clientIn ) : + client ( clientIn ), inTheEventQueue ( false ), + posted ( false ), ioComplete ( false ), serverDelete ( false ) { // // catch situation where they create more than one diff --git a/src/cas/generic/casDGClient.cc b/src/cas/generic/casDGClient.cc index a4bc6890c..ca32994c9 100644 --- a/src/cas/generic/casDGClient.cc +++ b/src/cas/generic/casDGClient.cc @@ -137,7 +137,7 @@ caStatus casDGClient::searchAction() // // ask the server tool if this PV exists // - this->asyncIOFlag = 0u; + this->asyncIOFlag = false; pvExistReturn pver = this->getCAS()->pvExistTest(this->ctx, pChanName); @@ -146,7 +146,7 @@ caStatus casDGClient::searchAction() // async IO but dont return status // indicating so (and vise versa) // - if (this->asyncIOFlag) { + if ( this->asyncIOFlag ) { if (pver.getStatus()!=pverAsyncCompletion) { errMessage (S_cas_badParameter, "- assuming asynch IO status from caServer::pvExistTest()"); diff --git a/src/cas/generic/casInternal.h b/src/cas/generic/casInternal.h index f725d89c3..c93526f9b 100644 --- a/src/cas/generic/casInternal.h +++ b/src/cas/generic/casInternal.h @@ -171,8 +171,8 @@ public: private: casMonEvent overFlowEvent; unsigned long const nElem; - epicsMutex &mutex; - casChannelI &ciu; + epicsMutex & mutex; + casChannelI & ciu; const casEventMask mask; caResId const clientId; unsigned char const dbrType; @@ -180,8 +180,8 @@ private: bool ovf; bool enabled; - void enable(); - void disable(); + void enable (); + void disable (); void push (const smartConstGDDPointer &pValue); casMonitor ( const casMonitor & ); @@ -238,11 +238,11 @@ protected: caStatus postIOCompletionI(); private: - unsigned inTheEventQueue:1; - unsigned posted:1; - unsigned ioComplete:1; - unsigned serverDelete:1; - unsigned duplicate:1; + bool inTheEventQueue:1; + bool posted:1; + bool ioComplete:1; + bool serverDelete:1; + bool duplicate:1; // // casEvent virtual call back function diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index d4f1da036..a48b11412 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -971,7 +971,7 @@ caStatus casStrmClient::claimChannelAction() // channel references it // epicsGuard < casCoreClient > guard ( * this ); - this->asyncIOFlag = 0u; + this->asyncIOFlag = false; // // attach to the PV @@ -983,7 +983,7 @@ caStatus casStrmClient::claimChannelAction() // async IO but dont return status // indicating so (and vise versa) // - if (this->asyncIOFlag) { + if ( this->asyncIOFlag ) { status = S_cas_success; } else if (pvar.getStatus() == S_casApp_asyncCompletion) { @@ -1570,7 +1570,7 @@ caStatus casStrmClient::write() // // clear async IO flag // - this->asyncIOFlag = 0u; + this->asyncIOFlag = false; // // DBR_STRING is stored outside the DD so it @@ -1588,7 +1588,7 @@ caStatus casStrmClient::write() // async IO but dont return status // indicating so (and vise versa) // - if (this->asyncIOFlag) { + if ( this->asyncIOFlag ) { if (status!=S_casApp_asyncCompletion) { fprintf(stderr, "Application returned %d from casPV::write() - expected S_casApp_asyncCompletion\n", @@ -1794,7 +1794,7 @@ caStatus casStrmClient::read (smartGDDPointer &pDescRet) // // clear the async IO flag // - this->asyncIOFlag = 0u; + this->asyncIOFlag = false; // // call the server tool's virtual function diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h index 5194d0da4..9d21c5d52 100644 --- a/src/cas/generic/server.h +++ b/src/cas/generic/server.h @@ -482,7 +482,7 @@ public: protected: epicsMutex mutex; casCtx ctx; - unsigned char asyncIOFlag; + bool asyncIOFlag; private: tsDLList < casAsyncIOI > ioInProgList;