[Frugalware-git] pacman-g2: libpacman: Introduce f_ptrlist_count and f_ptrlist_empty.

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b467a00db66616ae659b176dd12982a629ac3df0

commit b467a00db66616ae659b176dd12982a629ac3df0
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sun Nov 17 01:15:56 2013 +0100

libpacman: Introduce f_ptrlist_count and f_ptrlist_empty.

diff --git a/lib/libpacman/util/list.c b/lib/libpacman/util/list.c
index bce8641..f845d14 100644
--- a/lib/libpacman/util/list.c
+++ b/lib/libpacman/util/list.c
@@ -40,16 +40,15 @@ int f_list_contains(const FList *list, 
FListItemComparatorFunc comparator, const
return 0;
}

-int _pacman_list_count(const FList *list)
+int f_list_count(const FList *list)
{
int i;

for(i = 0; list; list = list->next, i++);
-
-       return(i);
+       return i;
}

-int _pacman_list_empty(const FList *list)
+int f_list_empty(const FList *list)
{
return list == NULL;
}
diff --git a/lib/libpacman/util/list.h b/lib/libpacman/util/list.h
index 7ea698f..4073229 100644
--- a/lib/libpacman/util/list.h
+++ b/lib/libpacman/util/list.h
@@ -49,9 +49,12 @@ typedef int (*_pacman_fn_cmp)(const void *, const void *);

#define _pacman_list_new f_ptrlist_new

+#define _pacman_list_count f_ptrlist_count
+#define _pacman_list_empty f_ptrlist_empty
+
int f_list_contains(const FList *list, FListItemComparatorFunc comparator, 
const void *comparator_data);
-int _pacman_list_count(const FList *list);
-int _pacman_list_empty(const FList *list);
+int f_list_count(const FList *list);
+int f_list_empty(const FList *list);
int _pacman_list_is_in(void *needle, const pmlist_t *haystack);
void f_list_foreach(const FList *list, FListItemVisitorFunc visitor, void 
*visitor_data);

@@ -70,6 +73,8 @@ FPtrList *f_ptrlist_new(void);
void f_ptrlist_free(FPtrList *list, FVisitorFunc visitor, void *visitor_data);

void f_ptrlist_clear(FPtrList *list, FVisitorFunc visitor, void *visitor_data);
+#define f_ptrlist_count f_list_count
+#define f_ptrlist_empty f_list_empty

#endif /* _PACMAN_LIST_H */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git