From 9db3eaed9573b0fdd2109b38261806bde12ff9c3 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Sat, 10 Jul 1999 00:55:07 +0000 Subject: [PATCH] the event tag is now a void * --- lib/dns/dispatch.c | 8 ++++---- lib/isc/event.c | 2 +- lib/isc/include/isc/event.h | 2 +- lib/isc/timer.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 4716ebb641..9ce2a00d4e 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -508,7 +508,7 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in) } else if (queue_response) { ISC_LIST_APPEND(resp->items, rev, link); } else { - ISC_EVENT_INIT(rev, sizeof(*rev), 0, 0, DNS_EVENT_DISPATCH, + ISC_EVENT_INIT(rev, sizeof(*rev), 0, NULL, DNS_EVENT_DISPATCH, resp->action, resp->arg, resp, NULL, NULL); XDEBUG(("Sent event for buffer %p (len %d) to task %p\n", rev->buffer.base, rev->buffer.length, resp->task)); @@ -1078,7 +1078,7 @@ do_next_response(dns_dispatch_t *disp, dns_dispentry_t *resp) ISC_LIST_UNLINK(disp->rq_events, ev, link); - ISC_EVENT_INIT(ev, sizeof(*ev), 0, 0, DNS_EVENT_DISPATCH, + ISC_EVENT_INIT(ev, sizeof(*ev), 0, NULL, DNS_EVENT_DISPATCH, resp->action, resp->arg, resp, NULL, NULL); resp->item_out = ISC_TRUE; XDEBUG(("Sent event for buffer %p (len %d) to task %p\n", @@ -1102,7 +1102,7 @@ do_next_request(dns_dispatch_t *disp, dns_dispentry_t *resp) ISC_LIST_UNLINK(disp->rq_events, ev, link); - ISC_EVENT_INIT(ev, sizeof(*ev), 0, 0, DNS_EVENT_DISPATCH, + ISC_EVENT_INIT(ev, sizeof(*ev), 0, NULL, DNS_EVENT_DISPATCH, resp->action, resp->arg, resp, NULL, NULL); resp->item_out = ISC_TRUE; XDEBUG(("Sent event for buffer %p (len %d) to task %p\n", @@ -1155,7 +1155,7 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp) * Send the shutdown failsafe event to this resp. */ ev = disp->failsafe_ev; - ISC_EVENT_INIT(ev, sizeof (*ev), 0, 0, DNS_EVENT_DISPATCH, + ISC_EVENT_INIT(ev, sizeof (*ev), 0, NULL, DNS_EVENT_DISPATCH, resp->action, resp->arg, resp, NULL, NULL); ev->result = ISC_R_CANCELED; ev->buffer.base = NULL; diff --git a/lib/isc/event.c b/lib/isc/event.c index 32132beeaf..5aefb67b03 100644 --- a/lib/isc/event.c +++ b/lib/isc/event.c @@ -50,7 +50,7 @@ isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, event = isc_mem_get(mctx, size); if (event == NULL) return (NULL); - ISC_EVENT_INIT(event, size, 0, 0, type, action, arg, sender, + ISC_EVENT_INIT(event, size, 0, NULL, type, action, arg, sender, destroy, mctx); return (event); diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h index 535511f76f..947ca0d0f8 100644 --- a/lib/isc/include/isc/event.h +++ b/lib/isc/include/isc/event.h @@ -43,7 +43,7 @@ typedef void (*isc_eventdestructor_t)(isc_event_t *); #define ISC_EVENT_COMMON(ltype) \ size_t size; \ unsigned int attributes; \ - unsigned int tag; \ + void * tag; \ isc_eventtype_t type; \ isc_taskaction_t action; \ void * arg; \ diff --git a/lib/isc/timer.c b/lib/isc/timer.c index 7ed3b2b96b..0a4486c142 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -201,7 +201,7 @@ destroy(isc_timer_t *timer) { timer, ISC_TASKEVENT_FIRSTEVENT, ISC_TASKEVENT_LASTEVENT, - 0); + NULL); deschedule(timer); UNLINK(manager->timers, timer, link); @@ -377,7 +377,7 @@ isc_timer_reset(isc_timer_t *timer, isc_timertype_t type, timer, ISC_TASKEVENT_FIRSTEVENT, ISC_TASKEVENT_LASTEVENT, - 0); + NULL); timer->type = type; timer->expires = *expires; timer->interval = *interval;