External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Make virReallocN 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:06 +01:00
parent 1107c0b9c3
commit 9eb7e9e817
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/viralloc.c
View File

@ -45,12 +45,11 @@ VIR_LOG_INIT("util.alloc");
* *
* Returns zero on success, aborts on OOM * Returns zero on success, aborts on OOM
*/ */
int virReallocN(void *ptrptr, void virReallocN(void *ptrptr,
size_t size, size_t size,
size_t count) size_t count)
{ {
*(void **)ptrptr = g_realloc_n(*(void**)ptrptr, size, count); *(void **)ptrptr = g_realloc_n(*(void**)ptrptr, size, count);
return 0;
} }
/** /**
@ -76,8 +75,7 @@ void virExpandN(void *ptrptr,
if (*countptr + add < *countptr) if (*countptr + add < *countptr)
abort(); abort();
if (virReallocN(ptrptr, size, *countptr + add) < 0) virReallocN(ptrptr, size, *countptr + add);
abort();
memset(*(char **)ptrptr + (size * *countptr), 0, size * add); memset(*(char **)ptrptr + (size * *countptr), 0, size * add);
*countptr += add; *countptr += add;
} }
@ -136,8 +134,7 @@ void virResizeN(void *ptrptr,
void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t toremove) void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t toremove)
{ {
if (toremove < *countptr) { if (toremove < *countptr) {
if (virReallocN(ptrptr, size, *countptr -= toremove) < 0) virReallocN(ptrptr, size, *countptr -= toremove);
abort();
} else { } else {
g_free(*((void **)ptrptr)); g_free(*((void **)ptrptr));
*((void **)ptrptr) = NULL; *((void **)ptrptr) = NULL;

4
src/util/viralloc.h
View File

@ -34,7 +34,7 @@
*/ */
/* Don't call these directly - use the macros below */ /* Don't call these directly - use the macros below */
int virReallocN(void *ptrptr, size_t size, size_t count) void virReallocN(void *ptrptr, size_t size, size_t count)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
void 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); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
@ -61,7 +61,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. * This macro is safe to use on arguments with side effects.
* *
* Returns 0 on success, aborts on OOM * Aborts on OOM
*/ */
#define VIR_REALLOC_N(ptr, count) virReallocN(&(ptr), sizeof(*(ptr)), (count)) #define VIR_REALLOC_N(ptr, count) virReallocN(&(ptr), sizeof(*(ptr)), (count))