diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-01-03 12:39:11 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2009-01-03 19:58:51 +0100 |
commit | 193eba85a9a6eff7c314f6afaaeff6bf3cff1399 (patch) | |
tree | 2f444ecda3aad8504299951eb388c8d262e5ce2f /lib | |
parent | e45ed828d042acca09cb1ed5b6dd7a24eb5e7ffd (diff) | |
download | samba-193eba85a9a6eff7c314f6afaaeff6bf3cff1399.tar.gz samba-193eba85a9a6eff7c314f6afaaeff6bf3cff1399.tar.bz2 samba-193eba85a9a6eff7c314f6afaaeff6bf3cff1399.zip |
tevent: add tevent_fd_set_auto_close()
tevent_fd_set_auto_close() is a simple wrapper
arround tevent_fd_set_close_fn() with a callback
that uses plain close(2).
metze
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tevent/testsuite.c | 3 | ||||
-rw-r--r-- | lib/tevent/tevent.c | 14 | ||||
-rw-r--r-- | lib/tevent/tevent.h | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c index ec57c5ad2e..1b811f5fa2 100644 --- a/lib/tevent/testsuite.c +++ b/lib/tevent/testsuite.c @@ -81,8 +81,9 @@ static bool test_event_context(struct torture_context *test, /* create a pipe */ pipe(fd); - fde = event_add_fd(ev_ctx, ev_ctx, fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE, + fde = event_add_fd(ev_ctx, ev_ctx, fd[0], EVENT_FD_READ, fde_handler, fd); + tevent_fd_set_auto_close(fde); event_add_timed(ev_ctx, ev_ctx, timeval_current_ofs(2,0), finished_handler, &finished); diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c index 93918cc14d..5582b583e7 100644 --- a/lib/tevent/tevent.c +++ b/lib/tevent/tevent.c @@ -53,6 +53,7 @@ */ #include "replace.h" +#include "system/filesys.h" #include "tevent.h" #include "tevent_internal.h" #include "tevent_util.h" @@ -250,6 +251,19 @@ void tevent_fd_set_close_fn(struct tevent_fd *fde, fde->event_ctx->ops->set_fd_close_fn(fde, close_fn); } +static void tevent_fd_auto_close_fn(struct tevent_context *ev, + struct tevent_fd *fde, + int fd, + void *private_data) +{ + close(fd); +} + +void tevent_fd_set_auto_close(struct tevent_fd *fde) +{ + tevent_fd_set_close_fn(fde, tevent_fd_auto_close_fn); +} + /* return the fd event flags */ diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h index 9d3b8aa39e..b02c7854bc 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -113,6 +113,7 @@ int tevent_loop_wait(struct tevent_context *ev); void tevent_fd_set_close_fn(struct tevent_fd *fde, tevent_fd_close_fn_t close_fn); +void tevent_fd_set_auto_close(struct tevent_fd *fde); uint16_t tevent_fd_get_flags(struct tevent_fd *fde); void tevent_fd_set_flags(struct tevent_fd *fde, uint16_t flags); |