Index: trunk/Ohana/src/opihi/pcontrol/CheckDoneHost.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/CheckDoneHost.c	(revision 7917)
+++ trunk/Ohana/src/opihi/pcontrol/CheckDoneHost.c	(revision 8424)
@@ -20,7 +20,8 @@
       FreeIOBuffer (&buffer);
       return (FALSE);
-      /** do we need to close the connection? **/
+      // XXX do we need to close the connection?
 
     case PCLIENT_HUNG:
+      // XXX should this be DONE or DOWN?/
       PutHost (host, PCONTROL_HOST_DONE, STACK_BOTTOM);
       if (VerboseMode()) gprint (GP_ERR, "host %s is not responding\n", host[0].hostname);
@@ -33,19 +34,15 @@
 
     default:
-      if (VerboseMode()) gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      exit (1);
+      ABORT ("unknown status for pclient command");  
   }
 
   /** successful command, examine result **/
   p = memstr (buffer.buffer, "STATUS", buffer.Nbuffer);
-  if (p == NULL) {
-    gprint (GP_ERR, "programming error: missing STATUS in pclient message (CheckDoneHost)\n");
-    exit (1);
-  }
+  ASSERT (p != NULL, "missing STATUS in pclient message (CheckDoneHost)");
+
   sscanf (p, "%*s %d", &status);
   switch (status) {
     case -1:
-      gprint (GP_ERR, "programming error: reset syntax error\n");
-      exit (1);
+      ABORT ("reset syntax error");
       
     case 0:
@@ -63,9 +60,7 @@
 
     default:
-      gprint (GP_ERR, "programming error: should not reach here (CheckDoneHost)\n");
-      exit (1);
+      ABORT ("should not reach here (CheckDoneHost)");
   }
-  gprint (GP_ERR, "programming error: should not reach here either (CheckDoneHost)\n");
-  exit (1);
+  ABORT ("should not reach here (CheckDoneHost)");
 }
 
