Merged RELEASE-1_1 back into trunk.

r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines

site_ansto/hardsup/Monitor/sock.c

@@ -178,7 +178,7 @@ void sock_check(int timeout)
     {
       if (fds[i].revents & POLLIN)
         fdv[i].input(i);
-      if (--ready)
+      if (--ready <= 0)
         break;
     }
   }
@@ -194,13 +194,13 @@ void sock_close(int n)
   dbg_printf(0, "sock_close\n");
   shutdown(fdv[n].fd, SHUT_RDWR);
   close(fdv[n].fd);
+  --num_fds;
   if (n != num_fds)
   {
     fdv[n] = fdv[num_fds];
     fds[n] = fds[num_fds];
   }
   fdv[num_fds].fd = -1;
-  --num_fds;
 }
 
 /**