gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-06 22:04:12 +01:00
Code Issues Projects Releases Wiki Activity

changed iface of WMFindInBag

Browse Source
This commit is contained in:
kojima
2000-04-02 20:16:30 +00:00
parent fc2a87c645
commit ee21c5bea6
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
WINGs/bagtree.c
View File

@@ -44,7 +44,7 @@ static int sortBag(WMBag *bag, int (*comparer)(const void*, const void*));
static void emptyBag(WMBag *bag);
static void freeBag(WMBag *bag);
static void mapBag(WMBag *bag, void (*function)(void*, void*), void *data);
static int findInBag(WMBag *bag, int (*match)(void*));;
static int findInBag(WMBag *bag, int (*match)(void*,void*), void *data);
static void *first(WMBag *bag, WMBagIterator *ptr);
static void *last(WMBag *bag, WMBagIterator *ptr);
static void *next(WMBag *bag, WMBagIterator *ptr);
@@ -785,28 +785,29 @@ static void mapBag(WMBag *self, void (*function)(void*, void*), void *data)
static int findInTree(W_TreeBag *tree, W_Node *node, int (*function)(void*))
static int findInTree(W_TreeBag *tree, W_Node *node,
int (*function)(void*,void*), void *cdata)
{
int index;
if (node == tree->nil)
return WBNotFound;
index = findInTree(tree, node->left, function);
index = findInTree(tree, node->left, function, cdata);
if (index != WBNotFound)
return index;
if ((*function)(node->data)) {
if ((*function)(node->data, cdata)) {
return node->index;
}
return findInTree(tree, node->right, function);
return findInTree(tree, node->right, function, cdata);
}
static int findInBag(WMBag *self, int (*match)(void*))
static int findInBag(WMBag *self, int (*match)(void*,void*), void *cdata)
{
return findInTree(SELF, SELF->root, match);
return findInTree(SELF, SELF->root, match, cdata);
}