REORG/MEDIUM: fd: get rid of FD_STLISTEN

This state was only used so that ev_sepoll did not match FD_STERROR, which
changed in previous patch. We can now safely remove this state.

diff --git a/include/types/fd.h b/include/types/fd.h
index c75734512bdd604a54bdede24cae8f816dab82d2..5d5c5ed8ee799cc0f4a8797eab74df1418ea9643 100644 (file)
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -32,7 +32,6 @@
 #include <types/protocols.h>
 
 /* different possible states for the fd */
-#define FD_STLISTEN    1
 #define FD_STCONN      2
 #define FD_STREADY     3
 #define FD_STERROR     4

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 1d38b3caa610299734aee7deb5f234e1189bf855..7da152a0d60a0e6a4de4bacd8a158bfb7f08823f 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -818,7 +818,7 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
        listener->state = LI_LISTEN;
 
        fdtab[fd].owner = listener; /* reference the listener instead of a task */
-       fdtab[fd].state = FD_STLISTEN;
+       fdtab[fd].state = 0; /* anything will do, but avoid FD_STERROR */
        fdtab[fd].flags = FD_FL_TCP | ((listener->options & LI_O_NOLINGER) ? FD_FL_TCP_NOLING : 0);
        fdtab[fd].cb[DIR_RD].f = listener->proto->accept;
        fdtab[fd].cb[DIR_WR].f = NULL; /* never called */

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 2b4c4de5e04a44319345d4cd171d22ae6988e253..35e48fd0664ae39d2c715f363154dac29bd70a9f 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -265,7 +265,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
        fdtab[fd].cb[DIR_RD].f = listener->proto->accept;
        fdtab[fd].cb[DIR_WR].f = NULL; /* never called */
        fdtab[fd].owner = listener; /* reference the listener instead of a task */
-       fdtab[fd].state = FD_STLISTEN;
+       fdtab[fd].state = 0; /* anything will do, but avoid FD_STERROR */
        return ERR_NONE;
  err_rename:
        ret = rename(backname, path);