fixed sun pro warnings

This commit is contained in:
Jeff Hill
2001-02-09 19:28:01 +00:00
parent dc957f400f
commit bf0537cf73
10 changed files with 26 additions and 12 deletions

View File

@@ -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)++;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 ();

View File

@@ -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 )
{
}

View File

@@ -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 &,

View File

@@ -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;

View File

@@ -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;

View File

@@ -51,7 +51,7 @@ const char *tcpSendWatchdog::name () const
return "TCP Send Watchdog";
}
void tcpSendWatchdog::arm ()
void tcpSendWatchdog::start ()
{
this->osiTimer::reschedule ();
}

View File

@@ -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 ) );