From 30a02b365fcd6f435d06ad871b313b5b331206ae Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 30 Jul 2009 23:51:48 +0000 Subject: [PATCH] incomingBytesPresent renamed to inCircuitBytesPending but this function isnt currently used --- src/cas/io/bsdSocket/casStreamIO.cc | 9 ++++----- src/cas/io/bsdSocket/casStreamIO.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/cas/io/bsdSocket/casStreamIO.cc b/src/cas/io/bsdSocket/casStreamIO.cc index 2001fcdff..1d2deb7e5 100644 --- a/src/cas/io/bsdSocket/casStreamIO.cc +++ b/src/cas/io/bsdSocket/casStreamIO.cc @@ -267,15 +267,14 @@ xBlockingStatus casStreamIO::blockingState() const { return this->blockingFlag; } - - -// casStreamIO :: incomingBytesPresent() -bufSizeT casStreamIO :: incomingBytesPresent () const + +// casStreamIO :: inCircuitBytesPending() +bufSizeT casStreamIO :: inCircuitBytesPending () 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 ) { int localError = SOCKERRNO; if ( diff --git a/src/cas/io/bsdSocket/casStreamIO.h b/src/cas/io/bsdSocket/casStreamIO.h index 46d5084d4..7aa70db08 100644 --- a/src/cas/io/bsdSocket/casStreamIO.h +++ b/src/cas/io/bsdSocket/casStreamIO.h @@ -31,7 +31,7 @@ public: void xSetNonBlocking (); const caNetAddr getAddr() const; void hostName ( char *pBuf, unsigned bufSize ) const; - bufSizeT incomingBytesPresent () const; + bufSizeT inCircuitBytesPending () const; bufSizeT osSendBufferSize () const; private: SOCKET sock;