fixed gnu warnings
This commit is contained in:
@@ -90,6 +90,10 @@ public:
|
||||
void subscriptionUpdateIfRequired (
|
||||
epicsGuard < epicsMutex > &, nciu & );
|
||||
protected:
|
||||
netSubscription (
|
||||
class privateInterfaceForIO &, unsigned type,
|
||||
arrayElementCount count,
|
||||
unsigned mask, cacStateNotify & );
|
||||
~netSubscription ();
|
||||
private:
|
||||
const arrayElementCount count;
|
||||
@@ -98,10 +102,6 @@ private:
|
||||
const unsigned type;
|
||||
const unsigned mask;
|
||||
bool updateWhileDisconnected;
|
||||
netSubscription (
|
||||
class privateInterfaceForIO &, unsigned type,
|
||||
arrayElementCount count,
|
||||
unsigned mask, cacStateNotify & );
|
||||
class netSubscription * isSubscription ();
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
@@ -137,11 +137,11 @@ public:
|
||||
void show (
|
||||
epicsGuard < epicsMutex > &, unsigned level ) const;
|
||||
protected:
|
||||
netReadNotifyIO ( privateInterfaceForIO &, cacReadNotify & );
|
||||
~netReadNotifyIO ();
|
||||
private:
|
||||
cacReadNotify & notify;
|
||||
class privateInterfaceForIO & privateChanForIO;
|
||||
netReadNotifyIO ( privateInterfaceForIO &, cacReadNotify & );
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
@@ -178,11 +178,11 @@ public:
|
||||
void show (
|
||||
epicsGuard < epicsMutex > &, unsigned level ) const;
|
||||
protected:
|
||||
netWriteNotifyIO ( privateInterfaceForIO &, cacWriteNotify & );
|
||||
~netWriteNotifyIO ();
|
||||
private:
|
||||
cacWriteNotify & notify;
|
||||
privateInterfaceForIO & privateChanForIO;
|
||||
netWriteNotifyIO ( privateInterfaceForIO &, cacWriteNotify & );
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
|
||||
@@ -400,7 +400,6 @@ private:
|
||||
friend enum channel_state epicsShareAPI ca_state ( chid pChan );
|
||||
friend void epicsShareAPI ca_set_puser ( chid pChan, void *puser );
|
||||
friend void * epicsShareAPI ca_puser ( chid pChan );
|
||||
friend void * epicsShareAPI ca_puser ( chid pChan );
|
||||
friend unsigned epicsShareAPI ca_read_access ( chid pChan );
|
||||
friend unsigned epicsShareAPI ca_write_access ( chid pChan );
|
||||
friend unsigned epicsShareAPI ca_search_attempts ( chid pChan );
|
||||
|
||||
@@ -97,6 +97,7 @@ public:
|
||||
epicsGuard < epicsMutex > & guard );
|
||||
void show ( epicsGuard < epicsMutex > &, unsigned level ) const;
|
||||
protected:
|
||||
syncGroupReadNotify ( struct CASG & sgIn, chid, void * pValueIn );
|
||||
virtual ~syncGroupReadNotify ();
|
||||
private:
|
||||
chid chan;
|
||||
@@ -106,7 +107,6 @@ private:
|
||||
cacChannel::ioid id;
|
||||
bool idIsValid;
|
||||
bool ioComplete;
|
||||
syncGroupReadNotify ( struct CASG & sgIn, chid, void * pValueIn );
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
@@ -140,6 +140,7 @@ public:
|
||||
epicsGuard < epicsMutex > & guard );
|
||||
void show ( epicsGuard < epicsMutex > &, unsigned level ) const;
|
||||
protected:
|
||||
syncGroupWriteNotify ( struct CASG &, chid );
|
||||
virtual ~syncGroupWriteNotify (); // allocate only from pool
|
||||
private:
|
||||
chid chan;
|
||||
@@ -148,7 +149,6 @@ private:
|
||||
cacChannel::ioid id;
|
||||
bool idIsValid;
|
||||
bool ioComplete;
|
||||
syncGroupWriteNotify ( struct CASG &, chid );
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
|
||||
@@ -269,15 +269,14 @@ LOCAL void log_header (
|
||||
"CAS: Request from %s => cmmd=%d cid=0x%x type=%d count=%d postsize=%u\n",
|
||||
hostName, mp->m_cmmd, mp->m_cid, mp->m_dataType, mp->m_count, mp->m_postsize);
|
||||
|
||||
|
||||
epicsPrintf (
|
||||
"CAS: Request from %s => available=0x%x \tN=%u paddr=%x\n",
|
||||
hostName, mp->m_available, mnum, (pciu?&pciu->addr:NULL));
|
||||
"CAS: Request from %s => available=0x%x \tN=%u paddr=%p\n",
|
||||
hostName, mp->m_available, mnum, (pciu?(void *)&pciu->addr:NULL));
|
||||
|
||||
if (mp->m_cmmd==CA_PROTO_WRITE && mp->m_dataType==DBF_STRING && pPayLoad ) {
|
||||
epicsPrintf (
|
||||
"CAS: Request from %s => \tThe string written: %s \n",
|
||||
hostName, pPayLoad );
|
||||
hostName, (char *)pPayLoad );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ void cas_send_bs_msg ( struct client *pclient, int lock_needed )
|
||||
if ( pclient->disconnect ) {
|
||||
if ( CASDEBUG > 2 ) {
|
||||
errlogPrintf ( "CAS: msg Discard for sock %d addr %x\n",
|
||||
pclient->sock, pclient->addr.sin_addr.s_addr );
|
||||
pclient->sock, (unsigned) pclient->addr.sin_addr.s_addr );
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,6 @@ void cast_server(void *pParm)
|
||||
osiSocklen_t recv_addr_size;
|
||||
unsigned short port;
|
||||
int nchars;
|
||||
int flag;
|
||||
|
||||
taskwdInsert(epicsThreadGetIdSelf(),NULL,NULL);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user