From b4bc931c72c86e70e7a4c2d8c7ebcb427d7c6fe0 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 30 Jul 2009 23:50:45 +0000 Subject: [PATCH] incomingBytesPresent renamed to dgInBytesPending, but this function is not currently used --- src/cas/io/bsdSocket/casDGIntfIO.cc | 7 ++++--- src/cas/io/bsdSocket/casDGIntfIO.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cas/io/bsdSocket/casDGIntfIO.cc b/src/cas/io/bsdSocket/casDGIntfIO.cc index f784333ec..ee06bac14 100644 --- a/src/cas/io/bsdSocket/casDGIntfIO.cc +++ b/src/cas/io/bsdSocket/casDGIntfIO.cc @@ -394,13 +394,14 @@ casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, // X aCC 361 return outBufClient::flushNone; } } - -bufSizeT casDGIntfIO::incomingBytesPresent () const // X aCC 361 + +bufSizeT casDGIntfIO :: + dgInBytesPending () const { int status; osiSockIoctl_t nchars = 0; - status = socket_ioctl ( this->sock, FIONREAD, & nchars ); // X aCC 392 + status = socket_ioctl ( this->sock, FIONREAD, & nchars ); if ( status < 0 ) { char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); diff --git a/src/cas/io/bsdSocket/casDGIntfIO.h b/src/cas/io/bsdSocket/casDGIntfIO.h index bf11183c6..637e6231b 100644 --- a/src/cas/io/bsdSocket/casDGIntfIO.h +++ b/src/cas/io/bsdSocket/casDGIntfIO.h @@ -41,7 +41,7 @@ public: static bufSizeT optimumInBufferSize (); - bufSizeT incomingBytesPresent () const; + bufSizeT dgInBytesPending () const; bufSizeT osSendBufferSize () const ; private: