External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Make virExpandN return void

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Jiri Denemark 2021-03-20 00:37:04 +01:00
parent 7d2fd6ef01
commit 52ef4a9af2
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/viralloc.c
View File

@ -66,12 +66,12 @@ int virReallocN(void *ptrptr,
* allocated memory. On failure, 'ptrptr' and 'countptr' are not
* changed. Any newly allocated memory in 'ptrptr' is zero-filled.
*
* Returns zero on success, aborts on OOM
* Aborts on OOM
*/
int virExpandN(void *ptrptr,
size_t size,
size_t *countptr,
size_t add)
void virExpandN(void *ptrptr,
size_t size,
size_t *countptr,
size_t add)
{
if (*countptr + add < *countptr)
abort();
@ -80,7 +80,6 @@ int virExpandN(void *ptrptr,
abort();
memset(*(char **)ptrptr + (size * *countptr), 0, size * add);
*countptr += add;
return 0;
}
/**
@ -192,8 +191,7 @@ virInsertElementsN(void *ptrptr, size_t size, size_t at,
if (inPlace) {
*countptr += add;
} else {
if (virExpandN(ptrptr, size, countptr, add) < 0)
abort();
virExpandN(ptrptr, size, countptr, add);
}
/* memory was successfully re-allocated. Move up all elements from

4
src/util/viralloc.h
View File

@ -36,7 +36,7 @@
/* Don't call these directly - use the macros below */
int virReallocN(void *ptrptr, size_t size, size_t count)
ATTRIBUTE_NONNULL(1);
int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add)
void virExpandN(void *ptrptr, size_t size, size_t *count, size_t add)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
void virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count, size_t desired)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
@ -78,7 +78,7 @@ int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr,
*
* This macro is safe to use on arguments with side effects.
*
* Returns 0 on success, aborts on OOM
* Aborts on OOM
*/
#define VIR_EXPAND_N(ptr, count, add) virExpandN(&(ptr), sizeof(*(ptr)), &(count), add)