openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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'
This commit is contained in:
Daniel P. Berrange 2010-11-23 13:31:43 +00:00
parent f86c7801e9
commit c73bd6f34a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/memory.c
View File

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