* sysdep.c: in the main server loop, when time_to_die is detected, return

  immediately instead of falling through to the end of the function.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 58b26c3125043c6ac2cb2db0b13ff427bda3f2a4..f044746414ed3238f7d45507345f1af8267868d2 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 626.3  2004/10/03 04:11:48  ajc
+ * sysdep.c: in the main server loop, when time_to_die is detected, return
+   immediately instead of falling through to the end of the function.
+
  Revision 626.2  2004/10/03 03:57:32  ajc
  * Added pthread_attr_destroy() in the appropriate location (thanks fleeb!)
 
@@ -6128,4 +6132,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 33b0db36919deb47a0aaa4911af0ad25217d10d6..59d3490455124d432a5ad983a581ddba899e57f9 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -959,7 +959,7 @@ do_select:  force_purge = 0;
                        retval = select(highest + 1, &readfds, NULL, NULL, &tv);
                }
                else {
-                       break;
+                       return;
                }
 
                /* Now figure out who made this select() unblock.
@@ -1029,7 +1029,7 @@ do_select:        force_purge = 0;
                }
 
                if (time_to_die) {
-                       break;
+                       return;
                }
 
                /* It must be a client socket.  Find a context that has data
@@ -1084,7 +1084,6 @@ SKIP_SELECT:
        }
 
        /* If control reaches this point, the server is shutting down */        
-       --num_threads;
        return NULL;
 }