From 565a47935c350d1dce374299e74071c4c526aaab Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Fri, 23 Jan 2004 20:15:35 +0000
Subject: [PATCH] fixed solaris warnings

---
 src/ca/ca_client_context.cpp |  6 +++---
 src/db/dbCAC.h               |  4 ++--
 src/db/dbContext.cpp         | 22 +++++++++++-----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/ca/ca_client_context.cpp b/src/ca/ca_client_context.cpp
index 1531d1cb0..17d7e9475 100644
--- a/src/ca/ca_client_context.cpp
+++ b/src/ca/ca_client_context.cpp
@@ -539,7 +539,7 @@ int ca_client_context::pendEvent ( const double & timeout )
 
     // process at least once if preemptive callback is disabled
     if ( this->pCallbackGuard.get() ) {
-        epicsGuardRelease < epicsMutex > unguard ( *this->pCallbackGuard );
+        epicsGuardRelease < epicsMutex > cbUnguard ( *this->pCallbackGuard );
         epicsGuard < epicsMutex > guard ( this->mutex );
 
         //
@@ -722,9 +722,9 @@ epicsMutex & ca_client_context::mutexRef () const
 }
 
 cacContext & ca_client_context::createNetworkContext ( 
-    epicsMutex & mutex, epicsMutex & cbMutex )
+    epicsMutex & mutexIn, epicsMutex & cbMutexIn )
 {
-    return * new cac ( mutex, cbMutex, *this );
+    return * new cac ( mutexIn, cbMutexIn, *this );
 }
 
 void epicsShareAPI caInstallDefaultService ( cacService & service )
diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h
index 0ed929ec9..798b52390 100644
--- a/src/db/dbCAC.h
+++ b/src/db/dbCAC.h
@@ -217,10 +217,10 @@ inline dbContextPrivateListOfIO::~dbContextPrivateListOfIO ()
 
 inline void dbContext::callReadNotify ( 
     epicsGuard < epicsMutex > & guard, struct dbAddr &addr, 
-    unsigned type, unsigned long count, cacReadNotify & notify )
+    unsigned type, unsigned long count, cacReadNotify & notifyIn )
 {
     guard.assertIdenticalMutex ( this-> mutex );
-    this->readNotifyCache.callReadNotify ( guard, addr, type, count, notify );
+    this->readNotifyCache.callReadNotify ( guard, addr, type, count, notifyIn );
 }
 
 #endif // dbCACh
diff --git a/src/db/dbContext.cpp b/src/db/dbContext.cpp
index 7b73195ca..8e56e96d9 100644
--- a/src/db/dbContext.cpp
+++ b/src/db/dbContext.cpp
@@ -138,13 +138,13 @@ void dbContext::destroyChannel (
 void dbContext::callStateNotify ( struct dbAddr & addr, 
         unsigned type, unsigned long count, 
         const struct db_field_log * pfl, 
-        cacStateNotify & notify )
+        cacStateNotify & notifyIn )
 {
     unsigned long size = dbr_size_n ( type, count );
 
     if ( type > INT_MAX ) {
         epicsGuard < epicsMutex > guard ( this->mutex );
-        notify.exception ( guard, ECA_BADTYPE, 
+        notifyIn.exception ( guard, ECA_BADTYPE, 
             "type code out of range (high side)", 
             type, count );
         return;
@@ -152,7 +152,7 @@ void dbContext::callStateNotify ( struct dbAddr & addr,
 
     if ( count > INT_MAX ) {
         epicsGuard < epicsMutex > guard ( this->mutex );
-        notify.exception ( guard, ECA_BADCOUNT, 
+        notifyIn.exception ( guard, ECA_BADCOUNT, 
             "element count out of range (high side)",
             type, count);
         return;
@@ -171,12 +171,12 @@ void dbContext::callStateNotify ( struct dbAddr & addr,
                     this->pStateNotifyCache, static_cast <int> ( count ), pvfl );
     if ( status ) {
         epicsGuard < epicsMutex > guard ( this->mutex );
-        notify.exception ( guard, ECA_GETFAIL, 
+        notifyIn.exception ( guard, ECA_GETFAIL, 
             "db_get_field() completed unsuccessfuly", type, count );
     }
     else { 
         epicsGuard < epicsMutex > guard ( this->mutex );
-        notify.current ( guard, type, count, this->pStateNotifyCache );
+        notifyIn.current ( guard, type, count, this->pStateNotifyCache );
     }
 }
 
@@ -190,7 +190,7 @@ void dbContext::subscribe (
     epicsGuard < epicsMutex > & guard,
     struct dbAddr & addr, dbChannelIO & chan,
     unsigned type, unsigned long count, unsigned mask, 
-    cacStateNotify & notify, cacChannel::ioid * pId )
+    cacStateNotify & notifyIn, cacChannel::ioid * pId )
 {
     guard.assertIdenticalMutex ( this->mutex );
 
@@ -240,7 +240,7 @@ void dbContext::subscribe (
     dbSubscriptionIO & subscr =
         * new ( this->dbSubscriptionIOFreeList ) 
         dbSubscriptionIO ( guard, this->mutex, *this, chan, 
-            addr, notify, type, count, mask, this->ctx );
+            addr, notifyIn, type, count, mask, this->ctx );
     chan.dbContextPrivateListOfIO::eventq.add ( subscr );
     this->ioTable.add ( subscr );
 
@@ -253,7 +253,7 @@ void dbContext::initiatePutNotify (
     epicsGuard < epicsMutex > & guard,
     dbChannelIO & chan, struct dbAddr & addr, 
     unsigned type, unsigned long count, const void * pValue, 
-    cacWriteNotify & notify, cacChannel::ioid * pId )
+    cacWriteNotify & notifyIn, cacChannel::ioid * pId )
 {
     guard.assertIdenticalMutex ( this->mutex );
     if ( ! chan.dbContextPrivateListOfIO::pBlocker ) {
@@ -263,7 +263,7 @@ void dbContext::initiatePutNotify (
         this->ioTable.add ( *chan.dbContextPrivateListOfIO::pBlocker );
     }
     chan.dbContextPrivateListOfIO::pBlocker->initiatePutNotify ( 
-        guard, notify, addr, type, count, pValue );
+        guard, notifyIn, addr, type, count, pValue );
     if ( pId ) {
         *pId = chan.dbContextPrivateListOfIO::pBlocker->getId ();
     }
@@ -390,7 +390,7 @@ unsigned dbContext::circuitCount (
 {
     guard.assertIdenticalMutex ( this->mutex );
     if ( this->pNetContext.get() ) {
-        this->pNetContext.get()->circuitCount ( guard );
+        return this->pNetContext.get()->circuitCount ( guard );
     }
     else {
         return 0u;
@@ -413,7 +413,7 @@ unsigned dbContext::beaconAnomaliesSinceProgramStart (
 {
     guard.assertIdenticalMutex ( this->mutex );
     if ( this->pNetContext.get() ) {
-        this->pNetContext.get()->beaconAnomaliesSinceProgramStart ( guard );
+        return this->pNetContext.get()->beaconAnomaliesSinceProgramStart ( guard );
     }
     else {
         return 0u;