From 69162db301ef5bca9a2c36f9c0214f83ef5815c1 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 27 Jun 2000 23:07:01 +0000
Subject: [PATCH] use iter.valid() and not iter.eol() (cosmetic)

---
 src/ca/cacServiceList.cpp |  2 +-
 src/ca/nciu.cpp           | 12 +++++++++---
 src/ca/searchTimer.cpp    |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/ca/cacServiceList.cpp b/src/ca/cacServiceList.cpp
index 709de08bd..48b12c3e9 100644
--- a/src/ca/cacServiceList.cpp
+++ b/src/ca/cacServiceList.cpp
@@ -36,7 +36,7 @@ cacLocalChannelIO * cacServiceList::createChannelIO (const char *pName, cacChann
 
     this->lock ();
     tsDLIterBD <cacServiceIO> iter ( this->services.first () );
-    while ( iter != iter.eol () ) {
+    while ( iter.valid () ) {
         pChanIO = iter->createChannelIO ( chan, pName );
         if ( pChanIO ) {
             break;
diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp
index c50cc035b..6ddb421cb 100644
--- a/src/ca/nciu.cpp
+++ b/src/ca/nciu.cpp
@@ -94,7 +94,7 @@ nciu::~nciu ()
      * remove any IO blocks still attached to this channel
      */
     tsDLIterBD <baseNMIU> iter = this->eventq.first ();
-    while ( iter != iter.eol () ) {
+    while ( iter.valid () ) {
         tsDLIterBD <baseNMIU> next = iter.itemAfter ();
         iter->destroy ();
         iter = next;
@@ -540,6 +540,12 @@ void nciu::hostName ( char *pBuf, unsigned bufLength ) const
     this->piiu->hostName ( pBuf, bufLength );
 }
 
+// deprecated - please do not use
+const char * nciu::pHostName () const
+{
+    return this->piiu->pHostName (); 
+}
+
 bool nciu::ca_v42_ok () const
 {
     return this->piiu->ca_v42_ok ();
@@ -628,7 +634,7 @@ void nciu::connect ( tcpiiu &iiu, unsigned nativeType,
  
     // resubscribe for monitors from this channel 
     tsDLIterBD<baseNMIU> iter = this->eventq.first ();
-    while ( iter != iter.eol () ) {
+    while ( iter.valid () ) {
         iter->subscriptionMsg ();
         iter++;
     }
@@ -654,7 +660,7 @@ void nciu::disconnect ()
      * look for events that have an event cancel in progress
      */
     tsDLIterBD <baseNMIU> iter = this->eventq.first ();
-    while ( iter != iter.eol () ) {
+    while ( iter.valid () ) {
         tsDLIterBD <baseNMIU> next = iter.itemAfter ();
         iter->disconnect ( hostNameBuf );
         iter = next;
diff --git a/src/ca/searchTimer.cpp b/src/ca/searchTimer.cpp
index f946ea0a3..5dd18fca9 100644
--- a/src/ca/searchTimer.cpp
+++ b/src/ca/searchTimer.cpp
@@ -212,7 +212,7 @@ void searchTimer::expire ()
      * the end of the list
      */
     firstChan = chan = this->iiu.chidList.first ();
-    while ( chan != chan.eol () ) {
+    while ( chan.valid () ) {
         
         this->minRetry = min (this->minRetry, chan->retry);