From 183c379fe58ca60f5ef2d1f2033d035d4117ac8f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 29 Dec 2008 20:24:57 +0100 Subject: s4:lib/tevent: rename structs list="" list="$list event_context:tevent_context" list="$list fd_event:tevent_fd" list="$list timed_event:tevent_timer" for s in $list; do o=`echo $s | cut -d ':' -f1` n=`echo $s | cut -d ':' -f2` r=`git grep "struct $o" |cut -d ':' -f1 |sort -u` files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4` for f in $files; do cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp mv $f.tmp $f done done metze --- source4/lib/messaging/irpc.h | 6 +++--- source4/lib/messaging/messaging.c | 16 ++++++++-------- source4/lib/messaging/pymessaging.c | 4 ++-- source4/lib/messaging/tests/irpc.c | 4 ++-- source4/lib/messaging/tests/messaging.c | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source4/lib/messaging') diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 3527f10648..fa91a147c6 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -37,7 +37,7 @@ struct irpc_message { struct messaging_context *msg_ctx; struct irpc_list *irpc; void *data; - struct event_context *ev; + struct tevent_context *ev; }; /* don't allow calls to take too long */ @@ -97,11 +97,11 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, const char *dir, struct server_id server_id, struct smb_iconv_convenience *iconv_convenience, - struct event_context *ev); + struct tevent_context *ev); struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx, const char *dir, struct smb_iconv_convenience *iconv_convenience, - struct event_context *ev); + struct tevent_context *ev); NTSTATUS messaging_send_ptr(struct messaging_context *msg, struct server_id server, uint32_t msg_type, void *ptr); void messaging_deregister(struct messaging_context *msg, uint32_t msg_type, void *private); diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index ff9ef8afc5..decad7b5a8 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -52,10 +52,10 @@ struct messaging_context { struct idr_context *idr; const char **names; struct timeval start_time; - struct timed_event *retry_te; + struct tevent_timer *retry_te; struct { - struct event_context *ev; - struct fd_event *fde; + struct tevent_context *ev; + struct tevent_fd *fde; } event; }; @@ -216,7 +216,7 @@ static NTSTATUS try_send(struct messaging_rec *rec) /* retry backed off messages */ -static void msg_retry_timer(struct event_context *ev, struct timed_event *te, +static void msg_retry_timer(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private) { struct messaging_context *msg = talloc_get_type(private, @@ -338,7 +338,7 @@ static void messaging_recv_handler(struct messaging_context *msg) /* handle a socket event */ -static void messaging_handler(struct event_context *ev, struct fd_event *fde, +static void messaging_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private) { struct messaging_context *msg = talloc_get_type(private, @@ -536,7 +536,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, const char *dir, struct server_id server_id, struct smb_iconv_convenience *iconv_convenience, - struct event_context *ev) + struct tevent_context *ev) { struct messaging_context *msg; NTSTATUS status; @@ -615,7 +615,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx, const char *dir, struct smb_iconv_convenience *iconv_convenience, - struct event_context *ev) + struct tevent_context *ev) { struct server_id id; ZERO_STRUCT(id); @@ -843,7 +843,7 @@ static int irpc_destructor(struct irpc_request *irpc) /* timeout a irpc request */ -static void irpc_timeout(struct event_context *ev, struct timed_event *te, +static void irpc_timeout(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private) { struct irpc_request *irpc = talloc_get_type(private, struct irpc_request); diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index 9f04bf0c6d..9cc14b4381 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -65,7 +65,7 @@ typedef struct { PyObject *py_messaging_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs) { - struct event_context *ev; + struct tevent_context *ev; const char *kwnames[] = { "own_id", "messaging_path", NULL }; PyObject *own_id = Py_None; const char *messaging_path = NULL; @@ -317,7 +317,7 @@ typedef struct { PyObject *py_irpc_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs) { - struct event_context *ev; + struct tevent_context *ev; const char *kwnames[] = { "server", "own_id", "messaging_path", NULL }; char *server; const char *messaging_path = NULL; diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c index d9b0548643..d45bcb6bf7 100644 --- a/source4/lib/messaging/tests/irpc.c +++ b/source4/lib/messaging/tests/irpc.c @@ -34,7 +34,7 @@ static bool test_debug; struct irpc_test_data { struct messaging_context *msg_ctx1, *msg_ctx2; - struct event_context *ev; + struct tevent_context *ev; }; /* @@ -53,7 +53,7 @@ static NTSTATUS irpc_AddOne(struct irpc_message *irpc, struct echo_AddOne *r) /* a deferred reply to echodata */ -static void deferred_echodata(struct event_context *ev, struct timed_event *te, +static void deferred_echodata(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private) { struct irpc_message *irpc = talloc_get_type(private, struct irpc_message); diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c index f66b3a5b43..838de55d83 100644 --- a/source4/lib/messaging/tests/messaging.c +++ b/source4/lib/messaging/tests/messaging.c @@ -58,7 +58,7 @@ static void exit_message(struct messaging_context *msg, void *private, */ static bool test_ping_speed(struct torture_context *tctx) { - struct event_context *ev; + struct tevent_context *ev; struct messaging_context *msg_client_ctx; struct messaging_context *msg_server_ctx; int ping_count = 0; -- cgit