projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the exit status for the proto-shell task, use WEXITSTATUS
[project/netifd.git]
/
utils.c
diff --git
a/utils.c
b/utils.c
index
15f0525
..
5219546
100644
(file)
--- a/
utils.c
+++ b/
utils.c
@@
-7,28
+7,22
@@
avl_strcmp(const void *k1, const void *k2, void *ptr)
return strcmp(k1, k2);
}
return strcmp(k1, k2);
}
-static int
-vlist_cmp(const void *k1, const void *k2, void *ptr)
-{
- struct vlist_tree *vl = ptr;
- return memcmp(k1, k2, vl->data_len);
-}
-
void
void
-__vlist_init(struct vlist_tree *tree, vlist_update_cb update, int offset, int len)
+__vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
+ vlist_update_cb update, int offset)
{
{
- tree->data_offset = offset;
- tree->data_len = len;
+ tree->key_offset = offset;
tree->update = update;
tree->version = 1;
tree->update = update;
tree->version = 1;
- avl_init(&tree->avl,
vlist_
cmp, 0, tree);
+ avl_init(&tree->avl, cmp, 0, tree);
}
void
vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
{
}
void
vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
{
- avl_delete(&tree->avl, &node->avl);
+ if (!tree->no_delete)
+ avl_delete(&tree->avl, &node->avl);
tree->update(tree, NULL, node);
}
tree->update(tree, NULL, node);
}
@@
-37,17
+31,23
@@
vlist_add(struct vlist_tree *tree, struct vlist_node *node)
{
struct vlist_node *old_node = NULL;
struct avl_node *anode;
{
struct vlist_node *old_node = NULL;
struct avl_node *anode;
+ void *key = (char *) node + tree->key_offset;
- node->avl.key =
(char *) node + tree->data_offset
;
+ node->avl.key =
key
;
node->version = tree->version;
node->version = tree->version;
- anode = avl_find(&tree->avl,
(char *) node + tree->data_offset
);
+ anode = avl_find(&tree->avl,
key
);
if (anode) {
old_node = container_of(anode, struct vlist_node, avl);
if (anode) {
old_node = container_of(anode, struct vlist_node, avl);
+ if (tree->keep_old || !tree->no_delete)
+ goto update_only;
+
avl_delete(&tree->avl, anode);
}
avl_insert(&tree->avl, &node->avl);
avl_delete(&tree->avl, anode);
}
avl_insert(&tree->avl, &node->avl);
+
+update_only:
tree->update(tree, node, old_node);
}
tree->update(tree, node, old_node);
}