Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fixed list_count() and list_contains() -- messed return codes..

Browse source
This commit is contained in:
Steffen Vogel 2015-12-11 18:19:17 +01:00
parent 8e9bca3dde
commit 00b0457102
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/list.c
View file

@ -81,7 +81,11 @@ void list_remove(struct list *l, void *p)
void * list_lookup(struct list *l, const char *name)
{
int cmp_helper(const void *a, const void *b) {
return strcmp(* (char **) a, b);
const struct {
char *name;
} *obj = a;
return strcmp(obj->name, b);
}
return list_search(l, cmp_helper, (void *) name);
@ -90,7 +94,7 @@ void * list_lookup(struct list *l, const char *name)
int list_contains(struct list *l, void *p)
{
int cmp_helper(const void *a, const void *b) {
return a == b;
return a == b ? 0 : 1;
}
return list_count(l, cmp_helper, p);
@ -103,7 +107,7 @@ int list_count(struct list *l, cmp_cb_t cmp, void *ctx)
pthread_mutex_lock(&l->lock);
list_foreach(void *e, l) {
if (!cmp(e, ctx))
if (cmp(e, ctx) == 0)
c++;
}

2
src/server.c
View file

@ -170,7 +170,7 @@ int main(int argc, char *argv[])
info("Starting nodes");
list_foreach(struct node *n, &nodes) { INDENT
int used_by_path(struct path *p, struct node *n) {
return (p->in == n) || list_contains(&p->destinations, n);
return (p->in == n) || list_contains(&p->destinations, n) ? 0 : 1;
}
int refs = list_count(&paths, (cmp_cb_t) used_by_path, n);