From 59b8f803d74c45e2477c533b5b380afb011f8ebe Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 10:18:29 +0100 Subject: [PATCH] s3:lib: s/struct timed_event/struct tevent_timer Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/include/smbldap.h | 2 +- source3/lib/ctdbd_conn.c | 4 ++-- source3/lib/smbldap.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index ea944cf78ff..ec5ff1ce841 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -53,7 +53,7 @@ struct smbldap_state { time_t last_use; /* monotonic */ struct tevent_context *tevent_context; - struct timed_event *idle_event; + struct tevent_timer *idle_event; struct timeval last_rebind; /* monotonic */ }; diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 4e66c176aa0..bae70c6fb5f 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -280,7 +280,7 @@ struct deferred_msg_state { */ static void deferred_message_dispatch(struct tevent_context *event_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { @@ -414,7 +414,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32_t reqid, ctdb_packet_dump(hdr); if (hdr->operation == CTDB_REQ_MESSAGE) { - struct timed_event *evt; + struct tevent_timer *evt; struct deferred_msg_state *msg_state; struct ctdb_req_message *msg = (struct ctdb_req_message *)hdr; diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 5dd6d8d65b3..08640d070af 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -1022,7 +1022,7 @@ done: } static void smbldap_idle_fn(struct tevent_context *tevent_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now_abs, void *private_data); @@ -1633,7 +1633,7 @@ int smbldap_search_suffix (struct smbldap_state *ldap_state, } static void smbldap_idle_fn(struct tevent_context *tevent_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now_abs, void *private_data) { -- 2.11.4.GIT