epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed sun pro warnings

Browse Source
This commit is contained in:
Jeff Hill
2002-08-22 15:53:14 +00:00
parent ebe7870015
commit 0f70d78803
10 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/access.cpp
-1
View File
@@ -540,7 +540,6 @@ int epicsShareAPI ca_array_put ( chtype type, arrayElementCount count,
int epicsShareAPI ca_change_connection_event ( chid pChan, caCh *pfunc )
{
return pChan->changeConnCallBack ( pfunc );
return ECA_INTERNAL;
}
/*
src/ca/cac.cpp
+21 -21
View File
@@ -431,10 +431,10 @@ void cac::uninstallCASG ( CASG & sg )
this->sgTable.remove ( sg );
}
CASG * cac::lookupCASG ( unsigned id )
CASG * cac::lookupCASG ( unsigned idIn )
{
epicsGuard < cacMutex > guard ( this->mutex );
CASG * psg = this->sgTable.lookup ( id );
CASG * psg = this->sgTable.lookup ( idIn );
if ( psg ) {
if ( ! psg->verify () ) {
psg = 0;
@@ -443,7 +443,7 @@ CASG * cac::lookupCASG ( unsigned id )
return psg;
}
void cac::registerService ( cacService &service )
void cac::registerService ( cacService & service )
{
this->services.registerService ( service );
}
@@ -781,7 +781,7 @@ cac::readNotifyRequest ( nciu &chan, unsigned type, // X aCC 361
return pIO.release()->getId ();
}
void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id )
void cac::ioCancel ( nciu &chan, const cacChannel::ioid & idIn )
{
baseNMIU * pmiu;
@@ -790,7 +790,7 @@ void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id )
// in deadlock
{
epicsGuard < cacMutex > guard ( this->mutex );
pmiu = this->ioTable.remove ( id );
pmiu = this->ioTable.remove ( idIn );
if ( ! pmiu ) {
return;
}
@@ -818,23 +818,23 @@ void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id )
}
}
void cac::ioShow ( const cacChannel::ioid &id, unsigned level ) const
void cac::ioShow ( const cacChannel::ioid & idIn, unsigned level ) const
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
baseNMIU * pmiu = this->ioTable.lookup ( id );
baseNMIU * pmiu = this->ioTable.lookup ( idIn );
if ( pmiu ) {
pmiu->show ( level );
}
}
void cac::ioCompletionNotify ( unsigned id, unsigned type,
void cac::ioCompletionNotify ( unsigned idIn, unsigned type,
arrayElementCount count, const void *pData )
{
baseNMIU * pmiu;
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
pmiu = this->ioTable.lookup ( id );
pmiu = this->ioTable.lookup ( idIn );
if ( ! pmiu ) {
return;
}
@@ -849,12 +849,12 @@ void cac::ioCompletionNotify ( unsigned id, unsigned type,
pmiu->completion ( type, count, pData );
}
void cac::ioExceptionNotify ( unsigned id, int status, const char *pContext )
void cac::ioExceptionNotify ( unsigned idIn, int status, const char *pContext )
{
baseNMIU * pmiu;
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
pmiu = this->ioTable.lookup ( id );
pmiu = this->ioTable.lookup ( idIn );
}
if ( ! pmiu ) {
@@ -871,14 +871,14 @@ void cac::ioExceptionNotify ( unsigned id, int status, const char *pContext )
pmiu->exception ( status, pContext );
}
void cac::ioExceptionNotify ( unsigned id, int status,
void cac::ioExceptionNotify ( unsigned idIn, int status,
const char *pContext, unsigned type, arrayElementCount count )
{
baseNMIU * pmiu;
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
pmiu = this->ioTable.lookup ( id );
pmiu = this->ioTable.lookup ( idIn );
if ( ! pmiu ) {
return;
}
@@ -893,10 +893,10 @@ void cac::ioExceptionNotify ( unsigned id, int status,
pmiu->exception ( status, pContext, type, count );
}
void cac::ioCompletionNotifyAndDestroy ( unsigned id )
void cac::ioCompletionNotifyAndDestroy ( unsigned idIn )
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
baseNMIU * pmiu = this->ioTable.remove ( id );
baseNMIU * pmiu = this->ioTable.remove ( idIn );
if ( ! pmiu ) {
return;
}
@@ -917,11 +917,11 @@ void cac::ioCompletionNotifyAndDestroy ( unsigned id )
pmiu->destroy ( *this );
}
void cac::ioCompletionNotifyAndDestroy ( unsigned id,
void cac::ioCompletionNotifyAndDestroy ( unsigned idIn,
unsigned type, arrayElementCount count, const void *pData )
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
baseNMIU * pmiu = this->ioTable.remove ( id );
baseNMIU * pmiu = this->ioTable.remove ( idIn );
if ( ! pmiu ) {
return;
}
@@ -941,11 +941,11 @@ void cac::ioCompletionNotifyAndDestroy ( unsigned id,
pmiu->destroy ( *this );
}
void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status,
void cac::ioExceptionNotifyAndDestroy ( unsigned idIn, int status,
const char *pContext )
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
baseNMIU * pmiu = this->ioTable.remove ( id );
baseNMIU * pmiu = this->ioTable.remove ( idIn );
if ( ! pmiu ) {
return;
}
@@ -965,11 +965,11 @@ void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status,
pmiu->destroy ( *this );
}
void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status,
void cac::ioExceptionNotifyAndDestroy ( unsigned idIn, int status,
const char *pContext, unsigned type, arrayElementCount count )
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
baseNMIU * pmiu = this->ioTable.remove ( id );
baseNMIU * pmiu = this->ioTable.remove ( idIn );
if ( ! pmiu ) {
return;
}
src/ca/tcpiiu.cpp
+6 -2
View File
@@ -830,7 +830,9 @@ bool tcpiiu::processIncoming ( epicsGuard < callbackMutex > & guard )
this->msgHeaderAvailable = false;
this->curDataBytes = 0u;
}
return false; // to make compiler happy...
# if defined ( __HP_aCC ) && _HP_aCC <= 033300
return false; // to make hpux compiler happy...
# endif
}
/*
@@ -1177,7 +1179,9 @@ bool tcpiiu::flush ()
return false;
}
}
return false; // happy compiler
# if defined ( __HP_aCC ) && _HP_aCC <= 033300
return false; // to make hpux compiler happy...
# endif
}
// ~tcpiiu() will not return while this->blockingForFlush is greater than zero
src/cas/generic/casChannelI.cc
+1 -1
View File
@@ -23,7 +23,7 @@
//
// casChannelI::casChannelI()
//
casChannelI::casChannelI ( const casCtx & ctx ) :
casChannelI::casChannelI ( const casCtx & ) :
pClient ( 0 ), pPV ( 0 ), cid ( 0xffffffff ),
accessRightsEvPending ( false )
{
src/cas/generic/casCoreClient.cc
+4 -4
View File
@@ -92,7 +92,7 @@ void casCoreClient::show (unsigned level) const
//
caStatus casCoreClient::asyncSearchResponse (
const caNetAddr &, const caHdrLargeArray &, const pvExistReturn &,
ca_uint16_t protocolRevision, ca_uint32_t sequenceNumber )
ca_uint16_t, ca_uint32_t )
{
return S_casApp_noSupport;
}
@@ -135,7 +135,7 @@ caStatus casCoreClient::enumPostponedCreateChanResponse ( casChannelI &,
return S_casApp_noSupport;
}
caStatus casCoreClient::channelCreateFailedResp ( const caHdrLargeArray &,
caStatus createStatus )
caStatus )
{
return S_casApp_noSupport;
}
@@ -143,7 +143,7 @@ caStatus casCoreClient::channelCreateFailedResp ( const caHdrLargeArray &,
//
// casCoreClient::installChannel()
//
void casCoreClient::installChannel (casChannelI &)
void casCoreClient::installChannel ( casChannelI & )
{
assert (0); // dont install channels on the wrong type of client
}
@@ -151,7 +151,7 @@ void casCoreClient::installChannel (casChannelI &)
//
// casCoreClient::removeChannel()
//
void casCoreClient::removeChannel (casChannelI &)
void casCoreClient::removeChannel ( casChannelI & )
{
assert (0); // dont install channels on the wrong type of client
}
src/cas/generic/casEventSys.cc
+1 -1
View File
@@ -235,7 +235,7 @@ void casEventSys::eventSignal()
// this is a pure virtual function, but we nevertheless need a
// noop to be called if they call this when we are in the
// casStrmClient destructor
caStatus casEventSys::disconnectChan (caResId id)
caStatus casEventSys::disconnectChan ( caResId )
{
return S_cas_success;
}
src/cas/generic/casPVListChan.cc
+2 -2
View File
@@ -27,9 +27,9 @@ casPVListChan::casPVListChan (const casCtx &ctx) :
{
}
void casPVListChan::bindToClient ( casCoreClient & client, casPVI & pv, caResId cid )
void casPVListChan::bindToClient ( casCoreClient & client, casPVI & pv, caResId cidIn )
{
this->bindToClientI ( client, pv, cid );
this->bindToClientI ( client, pv, cidIn );
this->pPV->installChannel ( *this );
}
src/cas/generic/casdef.h
+1 -1
View File
@@ -113,7 +113,7 @@ public:
// most server tools will use this
pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere );
// directory service server tools will use this (see caNetAddr.h)
pvExistReturn ( const caNetAddr & addressIn );
pvExistReturn ( const caNetAddr & );
~pvExistReturn ();
const pvExistReturn & operator = ( pvExistReturnEnum rhs );
const pvExistReturn & operator = ( const caNetAddr & rhs );
src/cas/generic/pvExistReturn.cc
+1 -1
View File
@@ -22,7 +22,7 @@
pvExistReturn::pvExistReturn ( pvExistReturnEnum s ) :
status ( s ) {}
pvExistReturn::pvExistReturn ( const caNetAddr & addressIn ) :
pvExistReturn::pvExistReturn ( const caNetAddr & ) :
status ( pverExistsHere ) {}
pvExistReturn::~pvExistReturn ()
src/libCom/cxxTemplates/resourceLib.h
+6 -6
View File
@@ -293,7 +293,7 @@ inline unsigned resTable<T,ID>::resTableBitMask ( const unsigned nBits )
// remove a res from the resTable
//
template <class T, class ID>
T * resTable<T,ID>::remove ( const ID &idIn ) // X aCC 361
T * resTable<T,ID>::remove ( const ID & idIn ) // X aCC 361
{
if ( this->pTable ) {
// search list for idIn and remove the first match
@@ -301,8 +301,8 @@ T * resTable<T,ID>::remove ( const ID &idIn ) // X aCC 361
tsSLIter <T> pItem = list.firstIter ();
T *pPrev = 0;
while ( pItem.valid () ) {
const ID & id = *pItem;
if ( id == idIn ) {
const ID & idOfItem = *pItem;
if ( idOfItem == idIn ) {
if ( pPrev ) {
list.remove ( *pPrev );
}
@@ -337,7 +337,7 @@ void resTable<T,ID>::removeAll ( tsSLList<T> & destination )
// resTable::lookup ()
//
template <class T, class ID>
inline T * resTable<T,ID>::lookup ( const ID &idIn ) const // X aCC 361
inline T * resTable<T,ID>::lookup ( const ID & idIn ) const // X aCC 361
{
if ( this->pTable ) {
tsSLList<T> & list = this->pTable [ this->hash ( idIn ) ];
@@ -669,8 +669,8 @@ T * resTable<T,ID>::find ( tsSLList<T> &list, const ID &idIn ) const
{
tsSLIter <T> pItem = list.firstIter ();
while ( pItem.valid () ) {
const ID &id = *pItem;
if ( id == idIn ) {
const ID & idOfItem = *pItem;
if ( idOfItem == idIn ) {
break;
}
pItem++;