[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4789-g550e0e4

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  550e0e499a44218694e56243a4898ba7d460314d (commit)
      from  e1f794a246feab1f100abd961e0e576f0b85453a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 550e0e499a44218694e56243a4898ba7d460314d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jan 5 20:55:24 2009 -0800

    s3:events: remove unused stuff
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/include/proto.h |    1 -
 source/lib/events.c    |   25 -------------------------
 2 files changed, 0 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index 98dcf4f..3ddeddf 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 8e6b0fb..31c5127 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)
 {


-- 
Samba Shared Repository