From de123a67d6d664fa86b85dc0861f44839df11656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Sun, 2 Feb 2020 08:39:45 +0100 Subject: [PATCH] isc_mempool_create cannot fail, change the return type to void --- lib/isc/include/isc/mem.h | 2 +- lib/isc/mem.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index 7d7aecef78..6c73e96689 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -451,7 +451,7 @@ isc_mem_renderjson(void *memobj0); * Memory pools */ -isc_result_t +void isc_mempool_create(isc_mem_t *mctx, size_t size, isc_mempool_t **mpctxp); /*%< * Create a memory pool. diff --git a/lib/isc/mem.c b/lib/isc/mem.c index d471891033..9e0887782f 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -1535,7 +1535,7 @@ isc_mem_gettag(isc_mem_t *ctx0) { * Memory pool stuff */ -isc_result_t +void isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) { isc__mem_t *mctx = (isc__mem_t *)mctx0; isc__mempool_t *mpctx; @@ -1579,8 +1579,6 @@ isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) { ISC_LIST_INITANDAPPEND(mctx->pools, mpctx, link); mctx->poolcnt++; MCTXUNLOCK(mctx); - - return (ISC_R_SUCCESS); } void