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

use isc_mem_create2

Browse source
This commit is contained in:
Mark Andrews 2016-11-09 16:24:48 +11:00
parent 01b507f4b4
commit 2b97639b9b
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/dns/dst_api.c
View file

@ -47,6 +47,7 @@
#include <isc/fsaccess.h>
#include <isc/hmacsha.h>
#include <isc/lex.h>
#include <isc/namespace.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
@ -135,22 +136,6 @@ static isc_result_t addsuffix(char *filename, int len,
return (_r); \
} while (0); \
#if defined(OPENSSL)
static void *
default_memalloc(void *arg, size_t size) {
UNUSED(arg);
if (size == 0U)
size = 1;
return (malloc(size));
}
static void
default_memfree(void *arg, void *ptr) {
UNUSED(arg);
free(ptr);
}
#endif
isc_result_t
dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx, unsigned int eflags) {
return (dst_lib_init2(mctx, ectx, NULL, eflags));
@ -185,8 +170,7 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
* ISC_MEMFLAG_INTERNAL as it will free up memory still being used
* by libcrypto.
*/
result = isc_mem_createx2(0, 0, default_memalloc, default_memfree,
NULL, &dst__memory_pool, 0);
result = isc_mem_create2(0, 0, &dst__memory_pool, 0);
if (result != ISC_R_SUCCESS)
return (result);
isc_mem_setname(dst__memory_pool, "dst", NULL);