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

commit 452291c875080a4cc076e45aeacfbfc19fa81987
Author: Michel Hermier <herm...@frugalware.org>
Date:   Mon Nov 18 13:40:40 2013 +0100

libpacman: Make f_ptrlistitem_ptrcmp not static.

diff --git a/lib/libpacman/util/list.c b/lib/libpacman/util/list.c
index b870537..9b69048 100644
--- a/lib/libpacman/util/list.c
+++ b/lib/libpacman/util/list.c
@@ -63,14 +63,9 @@ void f_list_foreach(const FList *list, FListItemVisitorFunc 
visitor, void *visit
}
}

-static
-int _pacman_ptrlistitem_ptrcmp(const FListItem *item, const void *ptr) {
-       return f_ptrcmp(item->data, ptr);
-}
-
int _pacman_list_is_in(void *needle, const pmlist_t *haystack)
{
-       return f_list_contains(haystack, _pacman_ptrlistitem_ptrcmp, needle);
+       return f_list_contains(haystack, f_ptrlistitem_ptrcmp, needle);
}

FListItem *f_list_find(const FList *list, FListItemComparatorFunc comparator, 
const void *comparator_data)
@@ -267,6 +262,10 @@ void f_ptrlistitem_delete(FListItem *item, FVisitor 
*visitor)
f_listitem_delete(item, visitor);
}

+int f_ptrlistitem_ptrcmp(const FListItem *item, const void *ptr) {
+       return f_ptrcmp(item->data, ptr);
+}
+
void f_ptrlist_free(FPtrList *list, FVisitor *visitor)
{
f_ptrlist_clear(list, visitor);
diff --git a/lib/libpacman/util/list.h b/lib/libpacman/util/list.h
index 5382179..78c9ec4 100644
--- a/lib/libpacman/util/list.h
+++ b/lib/libpacman/util/list.h
@@ -72,6 +72,8 @@ typedef struct __pmlist_t FPtrListItem;
FPtrListItem *f_ptrlistitem_new(void *ptr);
void f_ptrlistitem_delete(FListItem *item, FVisitor *visitor);

+int f_ptrlistitem_ptrcmp(const FListItem *item, const void *ptr);
+
FPtrList *f_ptrlist_new(void);
void f_ptrlist_free(FPtrList *list, FVisitor *visitor);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to