提交 c73bd6f3 编写于 作者: D Daniel P. Berrange

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'
上级 f86c7801
...@@ -237,18 +237,18 @@ int virResizeN(void *ptrptr, size_t size, size_t *allocptr, size_t count, ...@@ -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 * @ptrptr: pointer to pointer for address of allocated memory
* @size: number of bytes per element * @size: number of bytes per element
* @countptr: pointer to number of elements in array * @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 * 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 * 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. * 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) if (toremove < *countptr)
ignore_value(virReallocN(ptrptr, size, *countptr -= remove)); ignore_value(virReallocN(ptrptr, size, *countptr -= toremove));
else { else {
virFree(ptrptr); virFree(ptrptr);
*countptr = 0; *countptr = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册