fixed sun pro warnings
This commit is contained in:
@@ -1249,17 +1249,17 @@ cacChannel::ioid cac::subscriptionRequest ( nciu &chan, unsigned type,
|
||||
}
|
||||
}
|
||||
|
||||
bool cac::noopAction ( tcpiiu &iiu, const caHdr &, void *pMsgBdy )
|
||||
bool cac::noopAction ( tcpiiu &, const caHdr &, void * /* pMsgBdy */ )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cac::echoRespAction ( tcpiiu &iiu, const caHdr &, void *pMsgBdy )
|
||||
bool cac::echoRespAction ( tcpiiu &, const caHdr &, void * /* pMsgBdy */ )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cac::writeNotifyRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
bool cac::writeNotifyRespAction ( tcpiiu &, const caHdr &hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
int caStatus = hdr.m_cid;
|
||||
if ( caStatus == ECA_NORMAL ) {
|
||||
@@ -1358,13 +1358,13 @@ bool cac::eventRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
}
|
||||
}
|
||||
|
||||
bool cac::readRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
bool cac::readRespAction ( tcpiiu &, const caHdr &hdr, void *pMsgBdy )
|
||||
{
|
||||
return this->ioCompletionNotifyAndDestroy ( hdr.m_available,
|
||||
hdr.m_dataType, hdr.m_count, pMsgBdy );
|
||||
}
|
||||
|
||||
bool cac::clearChannelRespAction ( tcpiiu &iiu, const caHdr &, void *pMsgBdy )
|
||||
bool cac::clearChannelRespAction ( tcpiiu &, const caHdr &, void * /* pMsgBdy */ )
|
||||
{
|
||||
return true; // currently a noop
|
||||
}
|
||||
@@ -1412,7 +1412,7 @@ bool cac::exceptionRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
}
|
||||
}
|
||||
|
||||
bool cac::accessRightsRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
bool cac::accessRightsRespAction ( tcpiiu &, const caHdr &hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
nciu * pChan = this->chanTable.lookup ( hdr.m_cid );
|
||||
if ( pChan ) {
|
||||
@@ -1425,7 +1425,7 @@ bool cac::accessRightsRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cac::claimCIURespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
bool cac::claimCIURespAction ( tcpiiu &iiu, const caHdr &hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
nciu * pChan = this->chanTable.lookup ( hdr.m_cid );
|
||||
if ( pChan ) {
|
||||
@@ -1444,7 +1444,7 @@ bool cac::claimCIURespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
}
|
||||
}
|
||||
|
||||
bool cac::verifyAndDisconnectChan ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
bool cac::verifyAndDisconnectChan ( tcpiiu &, const caHdr &hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
nciu * pChan = this->chanTable.lookup ( hdr.m_cid );
|
||||
if ( pChan ) {
|
||||
@@ -1455,7 +1455,7 @@ bool cac::verifyAndDisconnectChan ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cac::badTCPRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy )
|
||||
bool cac::badTCPRespAction ( tcpiiu &iiu, const caHdr &hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
char hostName[64];
|
||||
iiu.hostName ( hostName, sizeof(hostName) );
|
||||
|
||||
@@ -331,7 +331,7 @@ public:
|
||||
nciu &chan, unsigned type, unsigned long count,
|
||||
unsigned mask, cacDataNotify ¬ify );
|
||||
void show ( unsigned level ) const;
|
||||
unsigned long getCount ( nciu & ) const;
|
||||
unsigned long getCount () const;
|
||||
unsigned getType () const;
|
||||
unsigned getMask () const;
|
||||
void destroy ( class cacRecycle & );
|
||||
|
||||
@@ -323,14 +323,14 @@ void nciu::subscribe ( unsigned type, unsigned long nElem,
|
||||
}
|
||||
}
|
||||
|
||||
void nciu::ioCancel ( const ioid &id )
|
||||
void nciu::ioCancel ( const ioid &idIn )
|
||||
{
|
||||
this->cacCtx.ioCancel ( *this, id );
|
||||
this->cacCtx.ioCancel ( *this, idIn );
|
||||
}
|
||||
|
||||
void nciu::ioShow ( const ioid &id, unsigned level ) const
|
||||
void nciu::ioShow ( const ioid &idIn, unsigned level ) const
|
||||
{
|
||||
this->cacCtx.ioShow ( id, level );
|
||||
this->cacCtx.ioShow ( idIn, level );
|
||||
}
|
||||
|
||||
void nciu::initiateConnect ()
|
||||
|
||||
@@ -59,10 +59,10 @@ void netSubscription::exception ( int status, const char *pContext )
|
||||
this->notify.exception ( status, pContext, UINT_MAX, 0 );
|
||||
}
|
||||
|
||||
void netSubscription::completion ( unsigned type,
|
||||
unsigned long count, const void *pData )
|
||||
void netSubscription::completion ( unsigned typeIn,
|
||||
unsigned long countIn, const void *pDataIn )
|
||||
{
|
||||
this->notify.completion ( type, count, pData );
|
||||
this->notify.completion ( typeIn, countIn, pDataIn );
|
||||
}
|
||||
|
||||
void netSubscription::exception ( int status,
|
||||
|
||||
@@ -46,9 +46,9 @@ inline void netSubscription::operator delete ( void *pCadaver, size_t size,
|
||||
}
|
||||
#endif
|
||||
|
||||
inline unsigned long netSubscription::getCount ( nciu &chan ) const
|
||||
inline unsigned long netSubscription::getCount () const
|
||||
{
|
||||
unsigned long nativeCount = chan.nativeElementCount ();
|
||||
unsigned long nativeCount = this->chan.nativeElementCount ();
|
||||
if ( this->count == 0u || this->count > nativeCount ) {
|
||||
return nativeCount;
|
||||
}
|
||||
|
||||
@@ -49,14 +49,14 @@ void netWriteNotifyIO::exception ( int status, const char *pContext )
|
||||
this->notify.exception ( status, pContext );
|
||||
}
|
||||
|
||||
void netWriteNotifyIO::completion ( unsigned type,
|
||||
unsigned long count, const void *pData )
|
||||
void netWriteNotifyIO::completion ( unsigned /* type */,
|
||||
unsigned long /* count */, const void * /* pData */ )
|
||||
{
|
||||
this->chan.getClient().printf ( "Write response with data ?\n" );
|
||||
}
|
||||
|
||||
void netWriteNotifyIO::exception ( int status,
|
||||
const char *pContext, unsigned type, unsigned long count )
|
||||
const char *pContext, unsigned /* type */, unsigned long /* count */ )
|
||||
{
|
||||
this->notify.exception ( status, pContext );
|
||||
}
|
||||
|
||||
@@ -1261,7 +1261,7 @@ void tcpiiu::subscriptionRequest ( nciu &chan, netSubscription & subscr )
|
||||
return;
|
||||
}
|
||||
|
||||
unsigned long count = subscr.getCount ( chan );
|
||||
unsigned long count = subscr.getCount ();
|
||||
if ( count == 0u || count > 0xffff ) {
|
||||
this->pCAC()->printf ( "CAC: subscriptionRequest() ignored because of unexpected bad count that was checked earlier\n" );
|
||||
return;
|
||||
@@ -1291,7 +1291,7 @@ void tcpiiu::subscriptionCancelRequest ( nciu &chan, netSubscription &subscr )
|
||||
this->sendQue.pushUInt16 ( CA_PROTO_EVENT_CANCEL ); // cmd
|
||||
this->sendQue.pushUInt16 ( 0u ); // postsize
|
||||
this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( subscr.getType () ) ); // dataType
|
||||
this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( subscr.getCount ( chan ) ) ); // count
|
||||
this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( subscr.getCount () ) ); // count
|
||||
this->sendQue.pushUInt32 ( chan.getSID () ); // cid
|
||||
this->sendQue.pushUInt32 ( subscr.getID() ); // available
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
virtual ~dbServiceIO ();
|
||||
cacChannel *createChannel ( const char *pName, cacChannelNotify & );
|
||||
void callReadNotify ( struct dbAddr &addr, unsigned type, unsigned long count,
|
||||
const struct db_field_log *pfl, cacChannel &, cacDataNotify ¬ify );
|
||||
const struct db_field_log *pfl, cacDataNotify ¬ify );
|
||||
dbEventSubscription subscribe ( struct dbAddr &addr, dbChannelIO &chan,
|
||||
dbSubscriptionIO &subscr, unsigned mask, cacChannel::ioid * );
|
||||
void initiatePutNotify ( dbChannelIO &, struct dbAddr &, unsigned type,
|
||||
|
||||
@@ -55,7 +55,7 @@ cacChannel::ioStatus dbChannelIO::read ( unsigned type,
|
||||
unsigned long count, cacDataNotify ¬ify, ioid * )
|
||||
{
|
||||
this->serviceIO.callReadNotify ( this->addr,
|
||||
type, count, 0, *this, notify );
|
||||
type, count, 0, notify );
|
||||
return iosSynch;
|
||||
}
|
||||
|
||||
|
||||
@@ -57,5 +57,5 @@ inline short dbChannelIO::nativeType () const
|
||||
inline void dbChannelIO::callReadNotify ( unsigned type, unsigned long count,
|
||||
const struct db_field_log *pfl, cacDataNotify ¬ify )
|
||||
{
|
||||
this->serviceIO.callReadNotify ( this->addr, type, count, pfl, *this, notify );
|
||||
this->serviceIO.callReadNotify ( this->addr, type, count, pfl, notify );
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ cacChannel *dbServiceIO::createChannel (
|
||||
void dbServiceIO::callReadNotify ( struct dbAddr &addr,
|
||||
unsigned type, unsigned long count,
|
||||
const struct db_field_log *pfl,
|
||||
cacChannel &chan, cacDataNotify ¬ify )
|
||||
cacDataNotify ¬ify )
|
||||
{
|
||||
unsigned long size = dbr_size_n ( type, count );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user