tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] void not void * in vector *_copy

Browse Source
This commit is contained in:
Al
2015-09-07 23:57:44 -07:00
parent cddffdb65f
commit 3fd6552b44
1 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/vector.h
View File

@@ -8,48 +8,48 @@
#include "klib/kvec.h" #include "klib/kvec.h"
// Wrapper around kvec.h to provide dynamically allocated vectors // Wrapper around kvec.h to provide dynamically allocated vectors
#define __VECTOR_BASE(name, type) typedef kvec_t(type) name; \ #define __VECTOR_BASE(name, type) typedef kvec_t(type) name; \
static inline name *name##_new(void) { \ static inline name *name##_new(void) { \
name *array = malloc(sizeof(name)); \ name *array = malloc(sizeof(name)); \
if (array == NULL) return NULL; \ if (array == NULL) return NULL; \
kv_init(*array); \ kv_init(*array); \
return array; \ return array; \
} \ } \
static inline name *name##_new_size(size_t size) { \ static inline name *name##_new_size(size_t size) { \
name *array = name##_new(); \ name *array = name##_new(); \
kv_resize(type, *array, size); \ kv_resize(type, *array, size); \
return array; \ return array; \
} \ } \
static inline void name##_push(name *array, type value) { \ static inline void name##_push(name *array, type value) { \
kv_push(type, *array, value); \ kv_push(type, *array, value); \
} \ } \
static inline void name##_extend(name *array, name *other) { \ static inline void name##_extend(name *array, name *other) { \
for (int i = 0; i < other->n; i++) { \ for (int i = 0; i < other->n; i++) { \
kv_push(type, *array, *(other->a + i)); \ kv_push(type, *array, *(other->a + i)); \
} \ } \
} \ } \
static inline type name##_pop(name *array) { \ static inline type name##_pop(name *array) { \
return kv_pop(*array); \ return kv_pop(*array); \
} \ } \
static inline void name##_clear(name *array) { \ static inline void name##_clear(name *array) { \
kv_clear(*array); \ kv_clear(*array); \
} \ } \
static inline void name##_resize(name *array, size_t size) { \ static inline void name##_resize(name *array, size_t size) { \
kv_resize(type, *array, size); \ kv_resize(type, *array, size); \
} \ } \
\ \
static inline void *name##_copy(name *dst, name *src, size_t n) { \ static inline void name##_copy(name *dst, name *src, size_t n) { \
if (dst->m < n) name##_resize(dst, n); \ if (dst->m < n) name##_resize(dst, n); \
memcpy(dst->a, src->a, n * sizeof(type)); \ memcpy(dst->a, src->a, n * sizeof(type)); \
dst->n = n; \ dst->n = n; \
} \ } \
\ \
static inline name *name##_new_copy(name *vector, size_t n) { \ static inline name *name##_new_copy(name *vector, size_t n) { \
name *cpy = name##_new_size(n); \ name *cpy = name##_new_size(n); \
name##_copy(cpy, vector, n); \ name##_copy(cpy, vector, n); \
return cpy; \ return cpy; \
} \ } \
\ \
#define __VECTOR_DESTROY(name, type) \ #define __VECTOR_DESTROY(name, type) \