diff --git a/lib/isc/event.c b/lib/isc/event.c index 4849d0162f..547c839bb9 100644 --- a/lib/isc/event.c +++ b/lib/isc/event.c @@ -46,37 +46,6 @@ isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, return (event); } -isc_event_t * -isc_event_constallocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, - isc_taskaction_t action, const void *arg, size_t size) { - isc_event_t *event; - void *deconst_arg; - - REQUIRE(size >= sizeof(struct isc_event)); - REQUIRE(action != NULL); - - event = isc_mem_get(mctx, size); - - /* - * Removing the const attribute from "arg" is the best of two - * evils here. If the event->ev_arg member is made const, then - * it affects a great many users of the task/event subsystem - * which are not passing in an "arg" which starts its life as - * const. Changing isc_event_allocate() and isc_task_onshutdown() - * to not have "arg" prototyped as const (which is quite legitimate, - * because neither of those functions modify arg) can cause - * compiler whining anytime someone does want to use a const - * arg that they themselves never modify, such as with - * gcc -Wwrite-strings and using a string "arg". - */ - DE_CONST(arg, deconst_arg); - - ISC_EVENT_INIT(event, size, 0, NULL, type, action, deconst_arg, sender, - destroy, mctx); - - return (event); -} - void isc_event_free(isc_event_t **eventp) { isc_event_t *event; diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h index 2349f3140c..8d7048cd52 100644 --- a/lib/isc/include/isc/event.h +++ b/lib/isc/include/isc/event.h @@ -82,9 +82,6 @@ ISC_LANG_BEGINDECLS isc_event_t * isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, isc_taskaction_t action, void *arg, size_t size); -isc_event_t * -isc_event_constallocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, - isc_taskaction_t action, const void *arg, size_t size); /*%< * Allocate an event structure. *