[memcached] sgrimm, r421: Merge revision 420 ("exit" variable rena...

[commits at code.sixapart.com]

Merge revision 420 ("exit" variable rename) into performance branch.
No functional change.


U   branches/performance/server/memcached.c


Modified: branches/performance/server/memcached.c
===================================================================
--- branches/performance/server/memcached.c	2006-10-19 23:29:55 UTC (rev 420)
+++ branches/performance/server/memcached.c	2006-10-19 23:34:28 UTC (rev 421)
@@ -1617,20 +1617,20 @@
 
 void drive_machine(conn *c) {
 
-    int exit = 0;
+    int stop = 0;
     int sfd, flags = 1;
     socklen_t addrlen;
     struct sockaddr addr;
     conn *newc;
     int res;
 
-    while (!exit) {
+    while (!stop) {
         switch(c->state) {
         case conn_listening:
             addrlen = sizeof(addr);
             if ((sfd = accept(c->sfd, &addr, &addrlen)) == -1) {
                 if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                    exit = 1;
+                    stop = 1;
                     break;
                 } else if (errno == EMFILE) {
                     if (settings.verbose > 0)
@@ -1672,7 +1672,7 @@
                 conn_set_state(c, conn_closing);
                 break;
             }
-            exit = 1;
+            stop = 1;
             break;
 
         case conn_nread:
@@ -1711,7 +1711,7 @@
                     conn_set_state(c, conn_closing);
                     break;
                 }
-                exit = 1;
+                stop = 1;
                 break;
             }
             /* otherwise we have a real error, on which we close the connection */
@@ -1754,7 +1754,7 @@
                     conn_set_state(c, conn_closing);
                     break;
                 }
-                exit = 1;
+                stop = 1;
                 break;
             }
             /* otherwise we have a real error, on which we close the connection */
@@ -1811,7 +1811,7 @@
                 break;                   /* Continue in state machine. */
 
             case TRANSMIT_SOFT_ERROR:
-                exit = 1;
+                stop = 1;
                 break;
             }
             break;
@@ -1821,7 +1821,7 @@
                 conn_cleanup(c);
             else
                 conn_close(c);
-            exit = 1;
+            stop = 1;
             break;
         }