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/Digital/display.c

@@ -184,7 +184,8 @@ void put_form(int n)
       "<input type=\"submit\" name=\"Send\" size=9 value=\"Update\">\r\n"
       "</td><td>"
       "<input type=\"reset\" name=\"Reset\" size=9 value=\"Reset\">\r\n"
-      "</td></tr></table>\r\n"
+      "</td></tr>"
+      "</table>\r\n"
       "</form>\r\n"
       "</body>\r\n"
       "</html>\r\n"      );
@@ -332,7 +333,7 @@ void put_page(int n)
   show_int(&buffer, "Poll Counter", device->poll_counter);
   add_text(&buffer, "</table></td><td valign=\"top\"><table>\r\n");
   add_text(&buffer, "<tr><td><a href=\"/form\">\r\n"
-      "<button>Form</button>\r\n"
+      "Form\r\n"
       "</a></td></tr>\r\n");
   add_text(&buffer, "</table></td></tr>\r\n");
   add_text(&buffer, "</table>\r\n"

site_ansto/hardsup/Digital/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;
 }
 
 /**