util: Make virExpandN return void

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/util/viralloc.c b/src/util/viralloc.c
index cd770eb60104b229677fe4ce71f913d1f3570bed..81f5ba9a091ead6c0503c5730b499ed2476ddbf8 100644 (file)
--- a/src/util/viralloc.c
+++ b/src/util/viralloc.c
@@ -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

diff --git a/src/util/viralloc.h b/src/util/viralloc.h
index 878c9485cfeb3a2426df26078e164887ecc266ac..6051c91913c63d06865e279b4e5e07649d5d5fad 100644 (file)
--- a/src/util/viralloc.h
+++ b/src/util/viralloc.h
@@ -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)