s3:events: move prototypes to event.h

metze
(cherry picked from commit 0add7303ea7cb71c070814306c7d6fc97c7c04c2)

diff --git a/source/include/event.h b/source/include/event.h
index 0465fae471f4e3829ad99ec0cb617ff59e9de48f..ebbf9c9f639c44b83ab6330408f7e003cb1387c7 100644 (file)
--- a/source/include/event.h
+++ b/source/include/event.h
@@ -18,7 +18,51 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+struct event_context;
+struct fd_event;
+struct timed_event;
+
 /* bits for file descriptor event flags */
 #define EVENT_FD_READ 1
 #define EVENT_FD_WRITE 2
 
+/* The following definitions come from lib/events.c  */
+
+struct timed_event *event_add_timed(struct event_context *event_ctx,
+                               TALLOC_CTX *mem_ctx,
+                               struct timeval when,
+                               const char *event_name,
+                               void (*handler)(struct event_context *event_ctx,
+                                               struct timed_event *te,
+                                               const struct timeval *now,
+                                               void *private_data),
+                               void *private_data);
+struct fd_event *event_add_fd(struct event_context *event_ctx,
+                             TALLOC_CTX *mem_ctx,
+                             int fd, uint16_t flags,
+                             void (*handler)(struct event_context *event_ctx,
+                                             struct fd_event *event,
+                                             uint16 flags,
+                                             void *private_data),
+                             void *private_data);
+void event_fd_set_writeable(struct fd_event *fde);
+void event_fd_set_not_writeable(struct fd_event *fde);
+void event_fd_set_readable(struct fd_event *fde);
+void event_fd_set_not_readable(struct fd_event *fde);
+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 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,
+                                        struct timeval *to_ret);
+int event_loop_once(struct event_context *ev);
+void event_context_reinit(struct event_context *ev);
+struct event_context *event_context_init(TALLOC_CTX *mem_ctx);
+int set_event_dispatch_time(struct event_context *event_ctx,
+                           const char *event_name, struct timeval when);
+int cancel_named_event(struct event_context *event_ctx,
+                      const char *event_name);
+void dump_event_list(struct event_context *event_ctx);
+

diff --git a/source/include/includes.h b/source/include/includes.h
index b90f12ad867c02723e304173f7b4dbb141f6405f..d1301711c26cc9977f1d427a7ee486a09db8cc11 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -657,6 +657,7 @@ typedef char fstring[FSTRING_LEN];
 #define talloc_get_type_abort(ptr, type) \
        (type *)talloc_check_name_abort(ptr, #type)
 
+#include "event.h"
 #include "nt_status.h"
 #include "ads.h"
 #include "ads_dns.h"
@@ -717,7 +718,6 @@ typedef char fstring[FSTRING_LEN];
 #include "nsswitch/winbind_client.h"
 #include "spnego.h"
 #include "rpc_client.h"
-#include "event.h"
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"

diff --git a/source/include/proto.h b/source/include/proto.h
index 3ddeddf0ce8c2115359159d290418cbc13fde1b6..6b7291f85f325e111eb729547a5f8c477664f1d9 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -519,46 +519,6 @@ void display_set_stderr(void);
 NTSTATUS map_nt_error_from_unix(int unix_error);
 int map_errno_from_nt_status(NTSTATUS status);
 
-/* The following definitions come from lib/events.c  */
-
-struct timed_event *event_add_timed(struct event_context *event_ctx,
-                               TALLOC_CTX *mem_ctx,
-                               struct timeval when,
-                               const char *event_name,
-                               void (*handler)(struct event_context *event_ctx,
-                                               struct timed_event *te,
-                                               const struct timeval *now,
-                                               void *private_data),
-                               void *private_data);
-struct fd_event *event_add_fd(struct event_context *event_ctx,
-                             TALLOC_CTX *mem_ctx,
-                             int fd, uint16_t flags,
-                             void (*handler)(struct event_context *event_ctx,
-                                             struct fd_event *event,
-                                             uint16 flags,
-                                             void *private_data),
-                             void *private_data);
-void event_fd_set_writeable(struct fd_event *fde);
-void event_fd_set_not_writeable(struct fd_event *fde);
-void event_fd_set_readable(struct fd_event *fde);
-void event_fd_set_not_readable(struct fd_event *fde);
-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 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,
-                                        struct timeval *to_ret);
-int event_loop_once(struct event_context *ev);
-void event_context_reinit(struct event_context *ev);
-struct event_context *event_context_init(TALLOC_CTX *mem_ctx);
-int set_event_dispatch_time(struct event_context *event_ctx,
-                           const char *event_name, struct timeval when);
-int cancel_named_event(struct event_context *event_ctx,
-                      const char *event_name);
-void dump_event_list(struct event_context *event_ctx);
-
 /* The following definitions come from lib/fault.c  */
 
 void fault_setup(void (*fn)(void *));

diff --git a/source/include/smb.h b/source/include/smb.h
index cea4fe5f7513ab5181ce679f8c12842816c649db..e7f08a39993d84de1b7195d80a3c90ec258d81ef 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -384,9 +384,6 @@ struct fd_handle {
        unsigned long gen_id;
 };
 
-struct event_context;
-struct fd_event;
-struct timed_event;
 struct idle_event;
 struct share_mode_entry;
 struct uuid;