From 45af8c58803077801debb8534acd63b48a7938df Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 16 May 2014 09:45:08 +0200 Subject: Add a vector implementation Signed-off-by: Lukas Fleischer --- src/Makefile.am | 1 + src/calcurse.h | 1 + src/vector.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vector.h | 77 ++++++++++++++++++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 src/vector.c create mode 100644 src/vector.h diff --git a/src/Makefile.am b/src/Makefile.am index d17da42..ddf0847 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,6 +38,7 @@ calcurse_SOURCES = \ utf8.c \ utils.c \ vars.c \ + vector.c \ wins.c \ mem.c \ dmon.c diff --git a/src/calcurse.h b/src/calcurse.h index 2fc97c8..421a02a 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -56,6 +56,7 @@ #include #include "llist.h" +#include "vector.h" #include "htable.h" #include "llist_ts.h" diff --git a/src/vector.c b/src/vector.c new file mode 100644 index 0000000..c1bab96 --- /dev/null +++ b/src/vector.c @@ -0,0 +1,128 @@ +/* + * Calcurse - text-based organizer + * + * Copyright (c) 2004-2013 calcurse Development Team + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the + * following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Send your feedback or comments to : misc@calcurse.org + * Calcurse home page : http://calcurse.org + * + */ + +#include "calcurse.h" + +/* + * Initialize a vector. + */ +void vector_init(vector_t *v, unsigned size) +{ + v->count = 0; + v->size = size; + v->data = malloc(size * sizeof(void *)); +} + +/* + * Free a vector, but not the contained data. + */ +void vector_free(vector_t *v) +{ + v->count = 0; + v->size = 0; + free(v->data); + v->data = NULL; +} + +/* + * Free the data contained in a vector. + */ +void vector_free_inner(vector_t *v, vector_fn_free_t fn_free) +{ + unsigned i; + + for (i = 0; i < v->count; i++) { + fn_free(v->data[i]); + } +} + +/* + * Get the first item of a vector. + */ +void *vector_first(vector_t *v) +{ + return v->data[0]; +} + +/* + * Get the nth item of a vector. + */ +void *vector_nth(vector_t *v, int n) +{ + return v->data[n]; +} + +/* + * Get the number of items in a vector. + */ +unsigned vector_count(vector_t *v) +{ + return v->count; +} + +/* + * Add an item at the end of a vector. + */ +void vector_add(vector_t *v, void *data) +{ + if (v->count >= v->size) { + v->size *= 2; + v->data = realloc(v->data, v->size * sizeof(void *)); + } + + v->data[v->count] = data; + v->count++; +} + +/* + * Sort a vector. + */ +void vector_sort(vector_t *v, vector_fn_cmp_t fn_cmp) +{ + qsort(v->data, v->count, sizeof(void *), fn_cmp); +} + +/* + * Remove an item from a vector. + */ +void vector_remove(vector_t *v, unsigned n) +{ + unsigned i; + + v->count--; + for (i = n; i < v->count; i++) + v->data[i + 1] = v->data[i]; +} diff --git a/src/vector.h b/src/vector.h new file mode 100644 index 0000000..a903e79 --- /dev/null +++ b/src/vector.h @@ -0,0 +1,77 @@ +/* + * Calcurse - text-based organizer + * + * Copyright (c) 2004-2013 calcurse Development Team + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the + * following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Send your feedback or comments to : misc@calcurse.org + * Calcurse home page : http://calcurse.org + * + */ + +#include "calcurse.h" + +typedef struct vector vector_t; +struct vector { + unsigned count; + unsigned size; + void **data; +}; + +typedef int (*vector_fn_cmp_t) (const void *, const void *); +typedef void (*vector_fn_free_t) (void *); + +/* Initialization and deallocation. */ +void vector_init(vector_t *, unsigned); +void vector_free(vector_t *); +void vector_free_inner(vector_t *, vector_fn_free_t); + +#define VECTOR_INIT(v, n) vector_init(v, n) +#define VECTOR_FREE(v) vector_free(v) +#define VECTOR_FREE_INNER(v, fn_free) \ + vector_free_inner(v, (vector_fn_free_t)fn_free) + +/* Retrieving vector items. */ +void *vector_first(vector_t *); +void *vector_nth(vector_t *, int); +unsigned vector_count(vector_t *); + +#define VECTOR_FIRST(v) vector_first(v) +#define VECTOR_NTH(v, n) vector_nth(v, n) +#define VECTOR_COUNT(v) vector_count(v) + +#define VECTOR_FOREACH(v, i) for (i = 0; i < VECTOR_COUNT(v); i++) + +/* Vector manipulation. */ +void vector_add(vector_t *, void *); +void vector_sort(vector_t *, vector_fn_cmp_t); +void vector_remove(vector_t *, unsigned); + +#define VECTOR_ADD(v, data) vector_add(v, data) +#define VECTOR_SORT(v, fn_cmp) vector_sort(v, (vector_fn_cmp_t)fn_cmp) +#define VECTOR_REMOVE(v, i) vector_remove(v, i) -- cgit v1.2.3-70-g09d2