[Carob-commits] CVS update of carob/src (ControllerWatcher.cpp)

[marc]

    Date: Wednesday, January 10, 2007 @ 10:57:41
  Author: marc
    Path: /cvsroot/carob/carob/src

Modified: ControllerWatcher.cpp (1.10 -> 1.11)

Cosmetic: renamed local variable "pt" to "self"


-----------------------+
 ControllerWatcher.cpp |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)


Index: carob/src/ControllerWatcher.cpp
diff -u carob/src/ControllerWatcher.cpp:1.10 
carob/src/ControllerWatcher.cpp:1.11
--- carob/src/ControllerWatcher.cpp:1.10        Tue Jan  9 20:55:38 2007
+++ carob/src/ControllerWatcher.cpp     Wed Jan 10 10:57:41 2007
@@ -45,23 +45,22 @@
 // extern C thread function that launches the ping
 void* ControllerWatcherThread(void * thisPtr)
 {
-  ControllerWatcher* pt = (ControllerWatcher*)thisPtr;
-  pt->run();
+  ControllerWatcher* self = (ControllerWatcher*)thisPtr;
+  self->run();
   
   // Function has finished, it means that we were stopped, so we have to clean
   // everything:
   // stop the pinger thread
-  pt->getControllerPingSenderPtr()->stop();
+  self->getControllerPingSenderPtr()->stop();
   // wait for the pinger to finish
-  pthread_join(pt->getPingerThread(), NULL);
+  pthread_join(self->getPingerThread(), NULL);
   // pinger has finished, we can close socket...
-  close(pt->getSocketFd());
+  close(self->getSocketFd());
   // ...and delete everything
-  delete(pt->getControllerPingSenderPtr());
-  delete(pt->getControllersPtr());
-  
-  // delete 'this'
-  delete pt;
+  delete(self->getControllerPingSenderPtr());
+  delete(self->getControllersPtr());
+
+  delete self;
   pthread_exit(NULL);
   return NULL;
 }

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits