From 0798d54b4fc28be881e2c4012663b1461bc85ba7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 3 Feb 2005 11:25:52 +0000
Subject: r5195: most events don't need the time of the event, so save a
 gettimeofday() call and just use timeval_current() when its actually needed
 (This used to be commit 236403cc4dc2924ed6a898acae0bb44cc1688dcc)

---
 source4/libcli/nbt/nbtsocket.c    | 2 +-
 source4/libcli/raw/clisocket.c    | 2 +-
 source4/libcli/raw/clitransport.c | 1 -
 source4/libcli/resolve/host.c     | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'source4/libcli')

diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index 8e6fda1ece..be1b7547f1 100644
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -210,7 +210,7 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
   handle fd events on a nbt_name_socket
 */
 static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *fde,
-				    struct timeval t, uint16_t flags, void *private)
+				    uint16_t flags, void *private)
 {
 	struct nbt_name_socket *nbtsock = talloc_get_type(private, 
 							  struct nbt_name_socket);
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index f9e662714b..69de86088a 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -73,7 +73,7 @@ static NTSTATUS smbcli_sock_connect_one(struct smbcli_socket *sock,
   has either completed the connect() or has returned an error
 */
 static void smbcli_sock_connect_handler(struct event_context *ev, struct fd_event *fde, 
-					struct timeval t, uint16_t flags, void *private)
+					uint16_t flags, void *private)
 {
 	struct composite_context *c = talloc_get_type(private, struct composite_context);
 	struct clisocket_connect *conn = talloc_get_type(c->private, struct clisocket_connect);
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 21303a34aa..d614d80d99 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -35,7 +35,6 @@ static void smbcli_transport_process_send(struct smbcli_transport *transport);
 */
 static void smbcli_transport_event_handler(struct event_context *ev, 
 					   struct fd_event *fde, 
-					   struct timeval t, 
 					   uint16_t flags, void *private)
 {
 	struct smbcli_transport *transport = talloc_get_type(private,
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index 977c804a4a..4df8f27534 100644
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -83,7 +83,7 @@ static void run_child(struct composite_context *c, int fd)
   handle a read event on the pipe
 */
 static void pipe_handler(struct event_context *ev, struct fd_event *fde, 
-			 struct timeval t, uint16_t flags, void *private)
+			 uint16_t flags, void *private)
 {
 	struct composite_context *c = talloc_get_type(private, struct composite_context);
 	struct host_state *state = talloc_get_type(c->private, struct host_state);
@@ -160,7 +160,7 @@ struct composite_context *resolve_name_host_send(struct nbt_name *name,
 
 	/* we need to put the child in our event context so
 	   we know when the gethostbyname() has finished */
-	state->fde = event_add_fd(c->event_ctx, state, state->child_fd, EVENT_FD_READ, 
+	state->fde = event_add_fd(c->event_ctx, c, state->child_fd, EVENT_FD_READ, 
 				  pipe_handler, c);
 	if (state->fde == NULL) {
 		close(fd[0]);
-- 
cgit