Re: [Libguestfs] [nbdkit PATCH 1/3] vector: Add VECT_remove

An upcoming patch wants to remove an arbitrary element from a vector. Also, add testsuite coverage for other functions added since the original unit test was written. It's a bit awkward that the compare for VECT_search and VECT_sort differ in type, but such is life (we indeed have search code where typing the key differently is useful).

Signed-off-by: Eric Blake <eblake(a)redhat.com&gt; --- common/utils/vector.h | 10 ++++++++++ common/utils/test-vector.c | 26 +++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/common/utils/vector.h b/common/utils/vector.h index c14644a7..880fd308 100644 --- a/common/utils/vector.h +++ b/common/utils/vector.h @@ -125,6 +125,16 @@ f (v->ptr[i]); \ } \ \ + /* Remove i'th element. i=0 => beginning i=size-1 => end */ \ + static inline int \ + name##_remove (name *v, size_t i) \ + { \ + if (i >= v->size) return -1; \ + memmove (&v->ptr[i], &v->ptr[i+1], (v->size-i) * sizeof (type)); \ + v->size--; \ + return 0; \ + } \