upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-19 02:28:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

isc_buffer_allocate() can't fail now, change the return type to void

Browse source
This commit is contained in:
Ondřej Surý 2020-02-02 08:00:20 +01:00
parent 9286548c7e
commit 4459745ff2
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/isc/buffer.c
View file

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

6
lib/isc/include/isc/buffer.h
View file

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