[libvirt] [PATCH 03/12] squash into initial 'create VIR_INSERT_ELEMENTS_N' patch

--- src/util/memory.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/memory.h b/src/util/memory.h index 5359ba0..872fec2 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -167,9 +167,9 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); /** * VIR_INSERT_ELEMENTS_N: * @ptr: pointer to hold address of allocated memory + * @at: index within array where new elements should be added * @count: variable tracking number of elements currently allocated * @add: number of elements to add - * @at: index within array where new elements should be added * @newelem: pointer to array of one or more new elements to move into place * (the originals will be zeroed out if successful) * @@ -185,7 +185,7 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); * * */ -# define VIR_INSERT_ELEMENTS_N(ptr, count, add, at, newelem) \ +# define VIR_INSERT_ELEMENTS_N(ptr, at, count, add, newelem) \ virInsertElementsN(&(ptr), sizeof(*(ptr)), &(count), add, at, newelem) /** @@ -213,9 +213,9 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); /** * VIR_DELETE_ELEMENTS_N: * @ptr: pointer to hold address of allocated memory + * @at: index within array where new elements should be deleted * @count: variable tracking number of elements currently allocated * @remove: number of elements to remove - * @at: index within array where new elements should be deleted * * Re-allocate an array of 'count' elements, each sizeof(*ptr) * bytes long, to be 'count' - 'remove' elements long, then store the @@ -224,7 +224,7 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); * * No return value. */ -# define VIR_DELETE_ELEMENTS_N(ptr, count, remove, at) \ +# define VIR_DELETE_ELEMENTS_N(ptr, at, count, remove) \ virDeleteElementsN(&(ptr), sizeof(*(ptr)), &(count), remove, at) /* -- 1.7.11.7