From db0905f2abe07abf843c80675946eebd012080a3 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 27 Jun 2000 22:34:08 +0000
Subject: [PATCH] use iter.valid()

---
 src/cas/generic/caServerI.cc | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/cas/generic/caServerI.cc b/src/cas/generic/caServerI.cc
index 969b33586..ba16e8c09 100644
--- a/src/cas/generic/caServerI.cc
+++ b/src/cas/generic/caServerI.cc
@@ -109,15 +109,14 @@ caServerI::~caServerI()
 	//
 	// delete all clients
 	//
-	tsDLIterBD<casStrmClient> iter(this->clientList.first());
-    while ( iter!=tsDLIterBD<casStrmClient>::eol() ) {
-		tsDLIterBD<casStrmClient> tmp = iter;
+	tsDLIterBD <casStrmClient> iter ( this->clientList.first () );
+    while ( iter.valid () ) {
+		tsDLIterBD <casStrmClient> tmp = iter;
 		++tmp;
 		//
 		// destructor takes client out of list
 		//
-		casStrmClient *pC = iter;
-		delete pC;
+		iter->destroy ();
 		iter = tmp;
 	}
 
@@ -246,9 +245,9 @@ void caServerI::sendBeacon()
 	// addresses.
 	// 
 	this->lock();
-	tsDLIterBD<casIntfOS> iter(this->intfList.first());
-	while ( iter ) {
-		iter->sendBeacon();
+	tsDLIterBD <casIntfOS> iter ( this->intfList.first () );
+	while ( iter.valid () ) {
+		iter->sendBeacon ();
 		iter++;
 	}
 	this->unlock();
@@ -280,15 +279,15 @@ void caServerI::show (unsigned level) const
     this->osiMutex::show(level);
     
     this->lock();
-    tsDLIterBD<casStrmClient> iterCl(this->clientList.first());
-    while ( iterCl!=tsDLIterBD<casStrmClient>::eol() ) {
-        iterCl->show(level);
+    tsDLIterBD<casStrmClient> iterCl( this->clientList.first () );
+    while ( iterCl.valid () ) {
+        iterCl->show (level);
         ++iterCl;
     }
     
-    tsDLIterBD<casIntfOS> iterIF(this->intfList.first());
-    while ( iterIF!=tsDLIterBD<casIntfOS>::eol() ) {
-        iterIF->casIntfOS::show(level);
+    tsDLIterBD<casIntfOS> iterIF ( this->intfList.first () );
+    while ( iterIF.valid () ) {
+        iterIF->casIntfOS::show ( level );
         ++iterIF;
     }