X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=octopi%2Flibrary%2Fsockets%2Fsocket_minder.cpp;h=e4fc5511fdd937fd2ead375d99de3807fa1f0d8d;hb=a4c99c6006b3aa20b5f65f02c2d30db7e790083a;hp=84368cdb1e9969a27f96c566349d5530daf09689;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/octopi/library/sockets/socket_minder.cpp b/octopi/library/sockets/socket_minder.cpp
index 84368cdb..e4fc5511 100644
--- a/octopi/library/sockets/socket_minder.cpp
+++ b/octopi/library/sockets/socket_minder.cpp
@@ -81,7 +81,7 @@ public:
   : ethread(SOCKET_CHECK_INTERVAL, ethread::SLACK_INTERVAL),
     _parent(parent)
   {
-    start(NIL);
+    start(NULL_POINTER);
   }
 
   ~socket_minder_prompter() {
@@ -109,7 +109,7 @@ socket_minder::socket_minder(post_office &post, int parent_route,
   _pending_sox(new int_set),
   _prompter(new socket_minder_prompter(*this))
 {
-  _prompter->start(NIL);
+  _prompter->start(NULL_POINTER);
 }
 
 socket_minder::~socket_minder()
@@ -145,7 +145,7 @@ astring socket_minder::text_form() const
 
 void socket_minder::snoozy_select()
 {
-//  FUNCDEF("snoozy_select");
+  FUNCDEF("snoozy_select");
   int_array read_sox;
   int_array write_sox;
   int_array pending;
@@ -233,13 +233,13 @@ socket_data *socket_minder::lock_socket_data(int socket)
       return _socket_list->borrow(i);
   // this is a failure to get here; there was no suitable socket.
   _lock->unlock();
-  return NIL;
+  return NULL_POINTER;
 }
 
 void socket_minder::unlock_socket_data(socket_data *to_unlock)
 {
   if (!to_unlock) return;
-//can't affect it now.  to_unlock = NIL;
+//can't affect it now.  to_unlock = NULL_POINTER;
   _lock->unlock();
 }
 
@@ -264,7 +264,7 @@ bool socket_minder::add_socket_data(int socket, bool server, int server_socket,
 
 bool socket_minder::remove_socket_data(int socket)
 {
-//  FUNCDEF("remove_socket_data");
+  FUNCDEF("remove_socket_data");
   auto_synchronizer l(*_lock);
   for (int i = 0; i < _socket_list->elements(); i++) {
     if (_socket_list->borrow(i)->_socket == socket) {