fixed gnu warnings

This commit is contained in:
Jeff Hill
2001-03-07 17:13:19 +00:00
parent 48f0c6aede
commit 8b38402d4b
7 changed files with 15 additions and 10 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ tsFreeList < struct CASG, 128 > CASG::freeList;
epicsMutex CASG::freeListMutex;
CASG::CASG (cac &cacIn) :
client (cacIn), magic (CASG_MAGIC), opPendCount (0u), seqNo (0u)
client (cacIn), opPendCount (0u), magic (CASG_MAGIC), seqNo (0u)
{
client.installCASG ( *this );
}
+6 -1
View File
@@ -268,7 +268,12 @@ extern "C" int epicsShareAPI ca_array_get ( chtype type,
return caStatus;
}
getCopy *pNotify = new getCopy ( *pcac, type, count, pValue );
if ( type < 0 ) {
return ECA_BADTYPE;
}
unsigned tmpType = static_cast < unsigned > ( type );
getCopy *pNotify = new getCopy ( *pcac, tmpType, count, pValue );
if ( ! pNotify ) {
return ECA_ALLOCMEM;
}
-1
View File
@@ -40,7 +40,6 @@ cac::cac ( bool enablePreemptiveCallbackIn ) :
enablePreemptiveCallback ( enablePreemptiveCallbackIn )
{
long status;
static epicsThreadOnceId once = EPICS_THREAD_ONCE_INIT;
unsigned abovePriority;
if ( ! osiSockAttach () ) {
+1 -1
View File
@@ -22,7 +22,7 @@
tsFreeList < class getCopy, 1024 > getCopy::freeList;
epicsMutex getCopy::freeListMutex;
getCopy::getCopy ( cac &cacCtxIn, chtype typeIn,
getCopy::getCopy ( cac &cacCtxIn, unsigned typeIn,
unsigned long countIn, void *pValueIn ) :
count ( countIn ), cacCtx ( cacCtxIn ), pValue ( pValueIn ),
readSeq ( cacCtxIn.sequenceNumberOfOutstandingIO () ), type ( typeIn )
+4 -3
View File
@@ -489,8 +489,9 @@ void nciu::show ( unsigned level ) const
printf ( "Channel \"%s\", connected to server %s",
this->pNameStr, hostNameTmp );
if ( level > 1u ) {
int tmpTypeCode = static_cast < int > ( this->typeCode );
printf ( ", native type %s, native element count %u",
dbf_type_to_text ( this->typeCode ), this->count );
dbf_type_to_text ( tmpTypeCode ), this->count );
printf ( ", %sread access, %swrite access",
this->accessRightState.read_access ? "" : "no ",
this->accessRightState.write_access ? "" : "no ");
@@ -505,8 +506,8 @@ void nciu::show ( unsigned level ) const
}
if ( level > 2u ) {
printf ( "\tnetwork IO pointer=%p\n",
this->piiu );
printf ( "\tnetwork IO pointer = %p\n",
static_cast <void *> ( this->piiu ) );
printf ( "\tserver identifier %u\n", this->sid );
printf ( "\tsearch retry number=%u, search retry sequence number=%u\n",
this->retry, this->retrySeqNo );
+2 -2
View File
@@ -44,7 +44,7 @@ private:
class getCopy : public cacNotify {
public:
getCopy ( cac &cacCtx, chtype type,
getCopy ( cac &cacCtx, unsigned type,
unsigned long count, void *pValue );
void release ();
void * operator new ( size_t size );
@@ -57,7 +57,7 @@ private:
cac &cacCtx;
void *pValue;
unsigned readSeq;
chtype type;
unsigned type;
void completionNotify ( cacChannelIO & );
void completionNotify ( cacChannelIO &,
unsigned type, unsigned long count, const void *pData);
+1 -1
View File
@@ -142,7 +142,7 @@ void recvProcessThread::show ( unsigned level ) const
printf ( "blocking for completion count %u\n", this->blockingForCompletion );
}
if ( level > 1u ) {
printf ( "\tCA client at %p\n", this->pcac );
printf ( "\tCA client at %p\n", static_cast < void * > ( this->pcac ) );
printf ( "\tshutdown command boolean %u\n", this->shutDown );
}
if ( level > 2u ) {