Re: [Libguestfs] [PATCH nbdkit 2/2] Add insert function and use the new vector library in several places.

This extends the vector library with an insert function. It is more expensive than appending, but this does not affect existing code using vector and can be used in new places without making those uses more expensive. We use this function in nbdkit-extentlist-filter, nbdkit-eval-plugin and the sparse library. This is refactoring, so should not affect functionality at all. However during the rewrite of eval it revealed a fencepost error in the loop iterating over method_scripts which is fixed here. --- common/sparse/Makefile.am | 1 + common/utils/vector.h | 24 +++++-- common/sparse/sparse.c | 50 +++++++------- plugins/eval/eval.c | 49 ++++++-------- filters/extentlist/extentlist.c | 113 ++++++++++++++++---------------- TODO | 5 +- 6 files changed, 119 insertions(+), 123 deletions(-)

+++ b/plugins/eval/eval.c

@@ -104,21 +106,12 @@ compare_script (const void *methodvp, const void *entryvp) static int insert_method_script (const char *method, char *script) { - struct method_script *newp; - size_t i; int r; + size_t i; + struct method_script new_entry = { .method = method, .script = script }; - newp = realloc (method_scripts, - sizeof (struct method_script) * (nr_method_scripts + 1)); - if (newp == NULL) { - nbdkit_error ("insert_method_script: realloc: %m"); - return -1; - } - nr_method_scripts++; - method_scripts = newp;

- - for (i = 0; i < nr_method_scripts-1; ++i) { - r = compare_script (method, &method_scripts[i]);

+ for (i = 0; i < method_scripts.size; ++i) { + r = compare_script (method, &method_scripts.ptr[i]);