Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=98113751578f5e0f6f5da7140863c2f61f9fd352
commit 98113751578f5e0f6f5da7140863c2f61f9fd352 Author: Michel Hermier <[email protected]> Date: Thu Oct 31 12:15:26 2013 +0100 libpacman: Move _pacman_list_count and _pacman_list_is_in in the file. diff --git a/lib/libpacman/util/list.c b/lib/libpacman/util/list.c index a1556ef..e2bb390 100644 --- a/lib/libpacman/util/list.c +++ b/lib/libpacman/util/list.c @@ -57,6 +57,28 @@ void _pacman_list_free(pmlist_t *list, _pacman_fn_free fn) } } +int _pacman_list_count(const pmlist_t *list) +{ + int i; + const pmlist_t *lp; + + for(lp = list, i = 0; lp; lp = lp->next, i++); + + return(i); +} + +int _pacman_list_is_in(void *needle, const pmlist_t *haystack) +{ + const pmlist_t *lp; + + for(lp = haystack; lp; lp = lp->next) { + if(lp->data == needle) { + return(1); + } + } + return(0); +} + pmlist_t *_pacman_list_add(pmlist_t *list, void *data) { pmlist_t *ptr, *lp; @@ -187,28 +209,6 @@ pmlist_t *_pacman_list_remove(pmlist_t *haystack, void *needle, _pacman_fn_cmp f return(haystack); } -int _pacman_list_count(const pmlist_t *list) -{ - int i; - const pmlist_t *lp; - - for(lp = list, i = 0; lp; lp = lp->next, i++); - - return(i); -} - -int _pacman_list_is_in(void *needle, const pmlist_t *haystack) -{ - const pmlist_t *lp; - - for(lp = haystack; lp; lp = lp->next) { - if(lp->data == needle) { - return(1); - } - } - return(0); -} - pmlist_t *_pacman_list_last(pmlist_t *list) { if(list == NULL) { diff --git a/lib/libpacman/util/list.h b/lib/libpacman/util/list.h index 85ed241..b24be6d 100644 --- a/lib/libpacman/util/list.h +++ b/lib/libpacman/util/list.h @@ -41,11 +41,13 @@ typedef int (*_pacman_fn_cmp)(const void *, const void *); pmlist_t *_pacman_list_new(void); void _pacman_list_free(pmlist_t *list, _pacman_fn_free fn); + +int _pacman_list_count(const pmlist_t *list); +int _pacman_list_is_in(void *needle, const pmlist_t *haystack); + pmlist_t *_pacman_list_add(pmlist_t *list, void *data); pmlist_t *_pacman_list_add_sorted(pmlist_t *list, void *data, _pacman_fn_cmp fn); pmlist_t *_pacman_list_remove(pmlist_t *haystack, void *needle, _pacman_fn_cmp fn, void **data); -int _pacman_list_count(const pmlist_t *list); -int _pacman_list_is_in(void *needle, const pmlist_t *haystack); pmlist_t *_pacman_list_last(pmlist_t *list); pmlist_t *_pacman_list_reverse(pmlist_t *list); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
