From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 23 Nov 2010 13:31:43 +0000 (+0000)
Subject: Rename 'remove' param to 'toremove' to avoid clash with stdio.h
X-Git-Tag: v0.8.6~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73bd6f34a03c6824543c47a1222dcc7f7a3c781;p=thirdparty%2Flibvirt.git

Rename 'remove' param to 'toremove' to avoid clash with stdio.h

The stdio.h header has a function called 'remove' declared. This
clashes with the 'remove' parameter in virShrinkN

* src/util/memory.c: Rename 'remove' to 'toremove'
---

diff --git a/src/util/memory.c b/src/util/memory.c
index 96222db3d3..f5061c0923 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -237,18 +237,18 @@ int virResizeN(void *ptrptr, size_t size, size_t *allocptr, size_t count,
  * @ptrptr: pointer to pointer for address of allocated memory
  * @size: number of bytes per element
  * @countptr: pointer to number of elements in array
- * @remove: number of elements to remove
+ * @toremove: number of elements to remove
  *
  * Resize the block of memory in 'ptrptr' to be an array of
- * '*countptr' - 'remove' elements, each 'size' bytes in length.
+ * '*countptr' - 'toremove' elements, each 'size' bytes in length.
  * Update 'ptrptr' and 'countptr'  with the details of the newly
- * allocated memory. If 'remove' is larger than 'countptr', free
+ * allocated memory. If 'toremove' is larger than 'countptr', free
  * the entire array.
  */
-void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t remove)
+void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t toremove)
 {
-    if (remove < *countptr)
-        ignore_value(virReallocN(ptrptr, size, *countptr -= remove));
+    if (toremove < *countptr)
+        ignore_value(virReallocN(ptrptr, size, *countptr -= toremove));
     else {
         virFree(ptrptr);
         *countptr = 0;