diff --git a/src/ca/acctst.c b/src/ca/acctst.c index 9fdeebf95..2d7554151 100644 --- a/src/ca/acctst.c +++ b/src/ca/acctst.c @@ -2180,7 +2180,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel ) for ( i = 0; i < NELEMENTS(test); i++ ) { test[i].count = 0; - test[i].lastValue = -1.0; + test[i].lastValue = -1.0f; SEVCHK(ca_add_event(DBR_GR_FLOAT, chan, updateTestEvent, &test[i], &test[i].id),NULL); } @@ -2235,7 +2235,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel ) for ( j = 0; j < NELEMENTS(test); j++ ) { SEVCHK ( ca_clear_event ( test[j].id ), NULL ); test[j].count = 0; - test[j].lastValue = -1.0; + test[j].lastValue = -1.0f; SEVCHK ( ca_add_event ( DBR_GR_FLOAT, chan, updateTestEvent, &test[j], &test[j].id ) , NULL ); } diff --git a/src/ca/comQueRecv.cpp b/src/ca/comQueRecv.cpp index 79b813864..db797fd65 100644 --- a/src/ca/comQueRecv.cpp +++ b/src/ca/comQueRecv.cpp @@ -178,7 +178,7 @@ epicsUInt8 comQueRecv::popUInt8 () if ( ! pComBuf ) { comBuf::throwInsufficentBytesException (); } - epicsUInt8 tmp = 0; + epicsUInt8 tmp = '\0'; comBuf::popStatus status = pComBuf->pop ( tmp ); if ( ! status.success ) { comBuf::throwInsufficentBytesException (); @@ -197,7 +197,7 @@ epicsUInt16 comQueRecv::popUInt16 () comBuf::throwInsufficentBytesException (); } // try first for all in one buffer efficent version - epicsUInt16 tmp; + epicsUInt16 tmp = 0; comBuf::popStatus status = pComBuf->pop ( tmp ); if ( status.success ) { this->nBytesPending -= sizeof ( epicsUInt16 ); @@ -216,7 +216,7 @@ epicsUInt32 comQueRecv::popUInt32 () comBuf::throwInsufficentBytesException (); } // try first for all in one buffer efficent version - epicsUInt32 tmp; + epicsUInt32 tmp = 0; comBuf::popStatus status = pComBuf->pop ( tmp ); if ( status.success ) { this->nBytesPending -= sizeof ( epicsUInt32 ); diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index 4d8d8e787..dafedab2c 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -1555,9 +1555,9 @@ void tcpiiu::subscriptionRequest ( CA_V49 ( this->minorProtocolVersion ) ); // extension - this->sendQue.pushFloat32 ( 0.0 ); // m_lval - this->sendQue.pushFloat32 ( 0.0 ); // m_hval - this->sendQue.pushFloat32 ( 0.0 ); // m_toval + this->sendQue.pushFloat32 ( 0.0f ); // m_lval + this->sendQue.pushFloat32 ( 0.0f ); // m_hval + this->sendQue.pushFloat32 ( 0.0f ); // m_toval this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( mask ) ); // m_mask this->sendQue.pushUInt16 ( 0u ); // m_pad minder.commit ();