From a806c7b1771e140b342c8d1928f65e6bbd8c3528 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 5 Jan 2009 20:55:24 -0800 Subject: [PATCH] s3:events: remove unused stuff metze (cherry picked from commit 550e0e499a44218694e56243a4898ba7d460314d) --- source/include/proto.h | 1 - source/lib/events.c | 25 ------------------------- 2 files changed, 26 deletions(-) diff --git a/source/include/proto.h b/source/include/proto.h index 98dcf4f8807..3ddeddf0ce8 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -546,7 +546,6 @@ bool event_add_to_select_args(struct event_context *event_ctx, const struct timeval *now, fd_set *read_fds, fd_set *write_fds, struct timeval *timeout, int *maxfd); -bool events_pending(struct event_context *event_ctx); bool run_events(struct event_context *event_ctx, int selrtn, fd_set *read_fds, fd_set *write_fds); struct timeval *get_timed_events_timeout(struct event_context *event_ctx, diff --git a/source/lib/events.c b/source/lib/events.c index 8e6b0fb7f6c..31c5127785e 100644 --- a/source/lib/events.c +++ b/source/lib/events.c @@ -44,16 +44,6 @@ struct fd_event { void *private_data; }; -#define EVENT_FD_WRITEABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) | EVENT_FD_WRITE) -#define EVENT_FD_READABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) | EVENT_FD_READ) - -#define EVENT_FD_NOT_WRITEABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_WRITE) -#define EVENT_FD_NOT_READABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_READ) - struct event_context { struct timed_event *timed_events; struct fd_event *fd_events; @@ -225,21 +215,6 @@ bool event_add_to_select_args(struct event_context *event_ctx, return True; } -bool events_pending(struct event_context *event_ctx) -{ - struct fd_event *fde; - - if (event_ctx->timed_events != NULL) { - return True; - } - for (fde = event_ctx->fd_events; fde; fde = fde->next) { - if (fde->flags & (EVENT_FD_READ|EVENT_FD_WRITE)) { - return True; - } - } - return False; -} - bool run_events(struct event_context *event_ctx, int selrtn, fd_set *read_fds, fd_set *write_fds) { -- 2.11.4.GIT