From bf0537cf730c628811903244dc252510a379df4f Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 9 Feb 2001 19:28:01 +0000 Subject: [PATCH] fixed sun pro warnings --- src/ca/caEventRate.cpp | 2 +- src/ca/casw.cpp | 2 +- src/ca/getCallback.cpp | 8 +++++++- src/ca/iocinf.h | 2 +- src/ca/netiiu.cpp | 4 ++-- src/ca/oldAccess.h | 2 ++ src/ca/oldSubscription.cpp | 8 +++++++- src/ca/putCallback.cpp | 4 ++-- src/ca/tcpSendWatchdog.cpp | 2 +- src/ca/tcpiiu.cpp | 4 ++-- 10 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/ca/caEventRate.cpp b/src/ca/caEventRate.cpp index 1b3da53aa..b0d4487c0 100644 --- a/src/ca/caEventRate.cpp +++ b/src/ca/caEventRate.cpp @@ -12,7 +12,7 @@ /* * event_handler() */ -void eventCallBack ( struct event_handler_args args ) +extern "C" void eventCallBack ( struct event_handler_args args ) { unsigned *pCount = static_cast < unsigned * > ( args.usr ); (*pCount)++; diff --git a/src/ca/casw.cpp b/src/ca/casw.cpp index 8b7d4b9e7..45d5ba655 100644 --- a/src/ca/casw.cpp +++ b/src/ca/casw.cpp @@ -16,7 +16,7 @@ #include "bhe_IL.h" #include "inetAddrID_IL.h" -int main ( int argc, char **argv ) +int main ( int, char ** ) { epicsTime programBeginTime = epicsTime::getCurrent (); SOCKET sock; diff --git a/src/ca/getCallback.cpp b/src/ca/getCallback.cpp index 375089013..ae397b64b 100644 --- a/src/ca/getCallback.cpp +++ b/src/ca/getCallback.cpp @@ -29,6 +29,12 @@ void getCallback::release () delete this; } +// eliminates SUN PRO warning +void getCallback::completionNotify ( cacChannelIO &io ) +{ + this->cacNotify::completionNotify ( io ); +} + void getCallback::completionNotify ( cacChannelIO &io, unsigned type, unsigned long count, const void *pData ) { @@ -56,7 +62,7 @@ void getCallback::exceptionNotify ( cacChannelIO &io, int status, } void getCallback::exceptionNotify ( cacChannelIO &io, - int status, const char *pContext, + int status, const char * /* pContext */, unsigned type, unsigned long count ) { struct event_handler_args args; diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h index af0a6ad68..6399ec9ac 100644 --- a/src/ca/iocinf.h +++ b/src/ca/iocinf.h @@ -684,7 +684,7 @@ class tcpSendWatchdog : private osiTimer { public: tcpSendWatchdog ( tcpiiu &, double periodIn, osiTimerQueue & queueIn ); ~tcpSendWatchdog (); - void arm (); + void start (); void cancel (); private: void expire (); diff --git a/src/ca/netiiu.cpp b/src/ca/netiiu.cpp index a4ed40561..df9105961 100644 --- a/src/ca/netiiu.cpp +++ b/src/ca/netiiu.cpp @@ -215,12 +215,12 @@ int netiiu::clearChannelRequest ( nciu & ) return ECA_DISCONNCHID; } -int netiiu::subscriptionRequest ( netSubscription &subscr, bool ) +int netiiu::subscriptionRequest ( netSubscription &, bool ) { return ECA_NORMAL; } -void netiiu::subscriptionCancelRequest ( netSubscription &, bool userThread ) +void netiiu::subscriptionCancelRequest ( netSubscription &, bool ) { } diff --git a/src/ca/oldAccess.h b/src/ca/oldAccess.h index afdad5635..0796d5ad4 100644 --- a/src/ca/oldAccess.h +++ b/src/ca/oldAccess.h @@ -51,6 +51,7 @@ protected: private: caEventCallBackFunc *pFunc; void *pPrivate; + void completionNotify ( cacChannelIO & ); void completionNotify ( cacChannelIO &, unsigned type, unsigned long count, const void *pData); void exceptionNotify ( cacChannelIO &, @@ -92,6 +93,7 @@ protected: private: caEventCallBackFunc *pFunc; void *pPrivate; + void completionNotify ( cacChannelIO & ); void completionNotify ( cacChannelIO &, unsigned type, unsigned long count, const void *pData ); void exceptionNotify ( cacChannelIO &, diff --git a/src/ca/oldSubscription.cpp b/src/ca/oldSubscription.cpp index ce7455598..38033a05c 100644 --- a/src/ca/oldSubscription.cpp +++ b/src/ca/oldSubscription.cpp @@ -19,6 +19,12 @@ oldSubscription::~oldSubscription () { } +// eliminates sun pro warning +void oldSubscription::completionNotify ( cacChannelIO &io ) +{ + this->cacNotify::completionNotify ( io ); +} + void oldSubscription::completionNotify ( cacChannelIO &io, unsigned type, unsigned long count, const void *pData) { @@ -48,7 +54,7 @@ void oldSubscription::exceptionNotify ( cacChannelIO &io, } void oldSubscription::exceptionNotify ( cacChannelIO &io, - int status, const char *pContext, + int status, const char * /* pContext */, unsigned type, unsigned long count ) { struct event_handler_args args; diff --git a/src/ca/putCallback.cpp b/src/ca/putCallback.cpp index c6e01c5a2..9f05e4f64 100644 --- a/src/ca/putCallback.cpp +++ b/src/ca/putCallback.cpp @@ -43,7 +43,7 @@ void putCallback::completionNotify ( cacChannelIO &io ) } void putCallback::completionNotify ( cacChannelIO &io, unsigned type, - unsigned long count, const void *pData ) + unsigned long count, const void * /* pData */ ) { struct event_handler_args args; @@ -71,7 +71,7 @@ void putCallback::exceptionNotify ( cacChannelIO &io, } void putCallback::exceptionNotify ( cacChannelIO &io, int status, - const char *pContext, unsigned type, unsigned long count ) + const char * /* pContext */, unsigned type, unsigned long count ) { struct event_handler_args args; diff --git a/src/ca/tcpSendWatchdog.cpp b/src/ca/tcpSendWatchdog.cpp index 57f9e0185..a4c54f275 100644 --- a/src/ca/tcpSendWatchdog.cpp +++ b/src/ca/tcpSendWatchdog.cpp @@ -51,7 +51,7 @@ const char *tcpSendWatchdog::name () const return "TCP Send Watchdog"; } -void tcpSendWatchdog::arm () +void tcpSendWatchdog::start () { this->osiTimer::reschedule (); } diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index e3432c983..5573f3de0 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -162,7 +162,7 @@ unsigned tcpiiu::sendBytes ( const void *pBuf, assert ( nBytesInBuf <= INT_MAX ); - this->sendDog.arm (); + this->sendDog.start (); while ( true ) { status = ::send ( this->sock, @@ -527,7 +527,7 @@ void tcpiiu::connect () /* * attempt to connect to a CA server */ - this->sendDog.arm (); + this->sendDog.start (); while ( ! this->sockCloseCompleted ) { int status = ::connect ( this->sock, &this->addr.sa, sizeof ( addr.sa ) );