From 4459745ff2425f38418acd5be2fcaf9bc969fc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Sun, 2 Feb 2020 08:00:20 +0100 Subject: [PATCH] isc_buffer_allocate() can't fail now, change the return type to void --- lib/isc/buffer.c | 14 ++++---------- lib/isc/include/isc/buffer.h | 6 +----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c index 66defe8bbb..8489aa5560 100644 --- a/lib/isc/buffer.c +++ b/lib/isc/buffer.c @@ -536,18 +536,14 @@ isc_buffer_copyregion(isc_buffer_t *b, const isc_region_t *r) { return (ISC_R_SUCCESS); } -isc_result_t +void isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, unsigned int length) { - isc_buffer_t *dbuf; - unsigned char * bdata; - REQUIRE(dynbuffer != NULL); - REQUIRE(*dynbuffer == NULL); + REQUIRE(dynbuffer != NULL && *dynbuffer == NULL); - dbuf = isc_mem_get(mctx, sizeof(isc_buffer_t)); - - bdata = isc_mem_get(mctx, length); + isc_buffer_t *dbuf = isc_mem_get(mctx, sizeof(isc_buffer_t)); + unsigned char *bdata = isc_mem_get(mctx, length); isc_buffer_init(dbuf, bdata, length); @@ -556,8 +552,6 @@ isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, dbuf->mctx = mctx; *dynbuffer = dbuf; - - return (ISC_R_SUCCESS); } isc_result_t diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index 07d259956c..4da1cfc11a 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -192,7 +192,7 @@ struct isc_buffer { *** Functions ***/ -isc_result_t +void isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, unsigned int length); /*!< @@ -204,10 +204,6 @@ isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, * *\li "dynbuffer" is non-NULL, and "*dynbuffer" is NULL. * - * Returns: - *\li ISC_R_SUCCESS - success - *\li ISC_R_NOMEMORY - no memory available - * * Note: *\li Changing the buffer's length field is not permitted. */