Mercurial > code
changeset 134:195cdc5f4a32
Cosmetic
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 12 Mar 2012 21:49:59 +0100 |
parents | d85dd98cb49d |
children | 07800b7af208 |
files | array.h parray.h |
diffstat | 2 files changed, 92 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/array.h Mon Mar 12 21:46:45 2012 +0100 +++ b/array.h Mon Mar 12 21:49:59 2012 +0100 @@ -50,26 +50,55 @@ typedef void (*array_map_fn)(void *, void *); typedef int (*array_cmp_fn)(void *, void *); -int array_init(struct array *, size_t); -void array_set(struct array *, const char *, ...); -int array_push(struct array *, const void *); -int array_insert(struct array *, const void *, int); -int array_append(struct array *, const void *); -void array_pop(struct array *); -void array_unqueue(struct array *); -void array_iremove(struct array *, int); -void array_premove(struct array *, const void *); -int array_iswap(struct array *, int, int); -int array_pswap(struct array *, const void *, const void *); -void array_map(const struct array *, array_map_fn, void *); -int array_find(const struct array *, array_cmp_fn, void *, void *); -void array_clear(struct array *); -void array_free(struct array *); +int +array_init(struct array *, size_t); + +void +array_set(struct array *, const char *, ...); + +int +array_push(struct array *, const void *); + +int +array_insert(struct array *, const void *, int); + +int +array_append(struct array *, const void *); + +void +array_pop(struct array *); + +void +array_unqueue(struct array *); + +void +array_iremove(struct array *, int); -#define ARRAY_FOREACH(a, var) \ - for ((a)->i = 0, (var) = (a)->data; \ - (a)->i < (a)->length; \ - ++(a)->i, ++(var)) +void +array_premove(struct array *, const void *); + +int +array_iswap(struct array *, int, int); + +int +array_pswap(struct array *, const void *, const void *); + +void +array_map(const struct array *, array_map_fn, void *); + +int +array_find(const struct array *, array_cmp_fn, void *, void *); + +void +array_clear(struct array *); + +void +array_free(struct array *); + +#define ARRAY_FOREACH(a, var, i) \ + for (i = 0, (var) = (a)->data; \ + i < (a)->length; \ + ++i, ++(var)) #ifdef __cplusplus }
--- a/parray.h Mon Mar 12 21:46:45 2012 +0100 +++ b/parray.h Mon Mar 12 21:49:59 2012 +0100 @@ -49,21 +49,50 @@ typedef void (*parray_map_fn)(void *, void *); typedef int (*parray_cmp_fn)(void *, void *); -int parray_init(struct parray *); -void parray_set(struct parray *, const char *, ...); -int parray_push(struct parray *, void *); -int parray_insert(struct parray *, void *, int); -int parray_append(struct parray *, void *); -void parray_pop(struct parray *); -void parray_unqueue(struct parray *); -void parray_iremove(struct parray *, int); -void parray_premove(struct parray *, const void *); -int parray_iswap(struct parray *, int, int); -int parray_pswap(struct parray *, const void *, const void *); -void parray_map(const struct parray *, parray_map_fn, void *); -int parray_find(const struct parray *, parray_cmp_fn, void *, void *); -void parray_clear(struct parray *); -void parray_free(struct parray *); +int +parray_init(struct parray *); + +void +parray_set(struct parray *, const char *, ...); + +int +parray_push(struct parray *, void *); + +int +parray_insert(struct parray *, void *, int); + +int +parray_append(struct parray *, void *); + +void +parray_pop(struct parray *); + +void +parray_unqueue(struct parray *); + +void +parray_iremove(struct parray *, int); + +void +parray_premove(struct parray *, const void *); + +int +parray_iswap(struct parray *, int, int); + +int +parray_pswap(struct parray *, const void *, const void *); + +void +parray_map(const struct parray *, parray_map_fn, void *); + +int +parray_find(const struct parray *, parray_cmp_fn, void *, void *); + +void +parray_clear(struct parray *); + +void +parray_free(struct parray *); #define PARRAY_FOREACH(a, o, i) \ for (i = 0, o = (a)->data[i]; \