tevent: remove TEVENT_FD_AUTOCLOSE feature

TEVENT_FD_AUTOCLOSE adds a dependency to SOCKET_WRAPPER,
which is bad. Callers should use tevent_fd_set_close_fn() now.

metze

diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index b02c7854bc5d7c2b45f5fd528e2659b4bcee02f7..b57d96f5fb99eb42b9b7414cd73ac28fcc0c6913 100644 (file)
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -120,7 +120,6 @@ void tevent_fd_set_flags(struct tevent_fd *fde, uint16_t flags);
 /* bits for file descriptor event flags */
 #define TEVENT_FD_READ 1
 #define TEVENT_FD_WRITE 2
-#define TEVENT_FD_AUTOCLOSE 4
 
 #define TEVENT_FD_WRITEABLE(fde) \
        tevent_fd_set_flags(fde, tevent_fd_get_flags(fde) | TEVENT_FD_WRITE)
@@ -200,7 +199,6 @@ int tevent_set_debug_stderr(struct tevent_context *ev);
 
 #define EVENT_FD_READ          TEVENT_FD_READ
 #define EVENT_FD_WRITE         TEVENT_FD_WRITE
-#define EVENT_FD_AUTOCLOSE     TEVENT_FD_AUTOCLOSE
 
 #define EVENT_FD_WRITEABLE(fde) \
        TEVENT_FD_WRITEABLE(fde)

diff --git a/lib/tevent/tevent_aio.c b/lib/tevent/tevent_aio.c
index decdcc7bbc4e79057c0f284d68622962aeb0dd6a..f4ed6d8a5ae8ce832b55841628cda8db4b6b5975 100644 (file)
--- a/lib/tevent/tevent_aio.c
+++ b/lib/tevent/tevent_aio.c
@@ -402,9 +402,6 @@ static int aio_event_fd_destructor(struct tevent_fd *fde)
        if (fde->close_fn) {
                fde->close_fn(ev, fde, fde->fd, fde->private_data);
                fde->fd = -1;
-       } else if (fde->flags & TEVENT_FD_AUTOCLOSE) {
-               close(fde->fd);
-               fde->fd = -1;
        }
 
        return 0;

diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index b46598946fd275b355b01a5e9169ab36a547dd74..023041981f45c1ff73705a6d85993e9cef084f0b 100644 (file)
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -360,9 +360,6 @@ static int epoll_event_fd_destructor(struct tevent_fd *fde)
        if (fde->close_fn) {
                fde->close_fn(ev, fde, fde->fd, fde->private_data);
                fde->fd = -1;
-       } else if (fde->flags & TEVENT_FD_AUTOCLOSE) {
-               close(fde->fd);
-               fde->fd = -1;
        }
 
        return 0;

diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c
index cca771ce85cae253b73789d4aafa6f47c1bf54c8..d94e473db81e91aa6ef35d5d9391feff02eb09cd 100644 (file)
--- a/lib/tevent/tevent_select.c
+++ b/lib/tevent/tevent_select.c
@@ -106,9 +106,6 @@ static int select_event_fd_destructor(struct tevent_fd *fde)
        if (fde->close_fn) {
                fde->close_fn(ev, fde, fde->fd, fde->private_data);
                fde->fd = -1;
-       } else if (fde->flags & TEVENT_FD_AUTOCLOSE) {
-               close(fde->fd);
-               fde->fd = -1;
        }
 
        return 0;

diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index e7f1e5f970c0fc3e15f990f99ffbd276ed93c109..145f510533b032d004ae668f5ddbbba474227a48 100644 (file)
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -394,9 +394,6 @@ static int std_event_fd_destructor(struct tevent_fd *fde)
        if (fde->close_fn) {
                fde->close_fn(ev, fde, fde->fd, fde->private_data);
                fde->fd = -1;
-       } else if (fde->flags & TEVENT_FD_AUTOCLOSE) {
-               close(fde->fd);
-               fde->fd = -1;
        }
 
        return 0;