upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 01:42:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ondrej/remove-isc_event_constallocate' into 'main'

Browse source 
Remove isc_event_constallocate()

See merge request isc-projects/bind9!6138
This commit is contained in:
Ondřej Surý 2022-04-19 12:23:30 +00:00
commit 861f25d930
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/isc/event.c
View file

@ -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;

3
lib/isc/include/isc/event.h
View file

@ -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.
*