diff options
Diffstat (limited to 'lib/libalpm/alpm_list.h')
| -rw-r--r-- | lib/libalpm/alpm_list.h | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 214deea4..39cbdd30 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -1,8 +1,8 @@ /* - * alpm_alpm_list.h - * + * alpm_list.h + * * Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,25 +15,33 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_LIST_H #define _ALPM_LIST_H -#include "alpm.h" +#ifdef __cplusplus +extern "C" { +#endif -/* Chained list struct */ -struct __alpm_list_t { +/** + * @brief Linked list type used by libalpm. + * + * It is exposed so front ends can use it to prevent the need to reimplement + * lists of their own; however, it is not required that the front end uses + * it. + */ +typedef struct __alpm_list_t { + /** data held by the list node */ void *data; + /** pointer to the previous node */ struct __alpm_list_t *prev; + /** pointer to the next node */ struct __alpm_list_t *next; -}; +} alpm_list_t; -/* TODO we should do away with these... they're messy*/ -#define _FREELIST(p, f) do { alpm_list_free_inner(p, f); alpm_list_free(p); p = NULL; } while(0) -#define FREELIST(p) _FREELIST(p, free) -#define FREELISTPTR(p) do { alpm_list_free(p); p = NULL; } while(0) +#define FREELIST(p) do { alpm_list_free_inner(p, free); alpm_list_free(p); p = NULL; } while(0) typedef void (*alpm_list_fn_free)(void *); /* item deallocation callback */ typedef int (*alpm_list_fn_cmp)(const void *, const void *); /* item comparison callback */ @@ -46,27 +54,33 @@ void alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn); /* item mutators */ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data); alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn); +alpm_list_t *alpm_list_join(alpm_list_t *first, alpm_list_t *second); alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_remove(alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn, void **data); -alpm_list_t *alpm_list_remove_node(alpm_list_t *node); -alpm_list_t *alpm_list_remove_dupes(alpm_list_t *list); -alpm_list_t *alpm_list_strdup(alpm_list_t *list); +alpm_list_t *alpm_list_remove_dupes(const alpm_list_t *list); +alpm_list_t *alpm_list_strdup(const alpm_list_t *list); +alpm_list_t *alpm_list_copy(const alpm_list_t *list); +alpm_list_t *alpm_list_copy_data(const alpm_list_t *list, size_t size); alpm_list_t *alpm_list_reverse(alpm_list_t *list); /* item accessors */ -alpm_list_t *alpm_list_first(alpm_list_t *list); -alpm_list_t *alpm_list_nth(alpm_list_t *list, int n); -alpm_list_t *alpm_list_next(alpm_list_t *list); -alpm_list_t *alpm_list_last(alpm_list_t *list); +alpm_list_t *alpm_list_first(const alpm_list_t *list); +alpm_list_t *alpm_list_nth(const alpm_list_t *list, int n); +alpm_list_t *alpm_list_next(const alpm_list_t *list); +alpm_list_t *alpm_list_last(const alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); /* misc */ int alpm_list_count(const alpm_list_t *list); -int alpm_list_find(alpm_list_t *haystack, const void *needle); -int alpm_list_find_str(alpm_list_t *haystack,const char *needle); -alpm_list_t *alpm_list_diff(alpm_list_t *lhs, alpm_list_t *rhs, alpm_list_fn_cmp fn); +void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn); +void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); +char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); +alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn); +#ifdef __cplusplus +} +#endif #endif /* _ALPM_LIST_H */ /* vim: set ts=2 sw=2 noet: */ |