From 9973ef0207d21535a05610ca50d9f45c7c56c758 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 22 Nov 2013 13:24:52 +0100 Subject: Use argv_array in place of vector Instead of using our own vector implementation, use argv_array from Git which has been specifically designed for dynamic size argv arrays. Drop vector.h and vector.c which are no longer needed. Signed-off-by: Lukas Fleischer --- vector.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 vector.c (limited to 'vector.c') diff --git a/vector.c b/vector.c deleted file mode 100644 index 0863908..0000000 --- a/vector.c +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include -#include -#include "vector.h" - -static int grow(struct vector *vec, int gently) -{ - size_t new_alloc; - void *new_data; - - new_alloc = vec->alloc * 3 / 2; - if (!new_alloc) - new_alloc = 8; - new_data = realloc(vec->data, new_alloc * vec->size); - if (!new_data) { - if (gently) - return ENOMEM; - perror("vector.c:grow()"); - exit(1); - } - vec->data = new_data; - vec->alloc = new_alloc; - return 0; -} - -int vector_push(struct vector *vec, const void *data, int gently) -{ - int rc; - - if (vec->count == vec->alloc && (rc = grow(vec, gently))) - return rc; - if (data) - memmove(vec->data + vec->count * vec->size, data, vec->size); - else - memset(vec->data + vec->count * vec->size, 0, vec->size); - vec->count++; - return 0; -} -- cgit v1.2.3-24-g4f1b