improve zarray_iter
This commit is contained in:
parent
05abed1964
commit
e85ce0e5ad
12 changed files with 72 additions and 75 deletions
|
|
@ -136,7 +136,8 @@ void zarray_fini(zarray_t* array)
|
|||
}
|
||||
}
|
||||
|
||||
int zarray_iter_ex(zarray_t* array, xlist_t* l, void* arg)
|
||||
int zarray_iter_ex(zarray_t* array, zarray_iter_skip_fn_t skipfn, xlist_t* l,
|
||||
void* arg)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
|
|
@ -154,6 +155,14 @@ int zarray_iter_ex(zarray_t* array, xlist_t* l, void* arg)
|
|||
}
|
||||
|
||||
for (i = 0; i < array->caps; i++) {
|
||||
if (skipfn != NULL) {
|
||||
if (skipfn(array->data[i])) {
|
||||
continue;
|
||||
}
|
||||
} else if (array->data[i] == NULL) {
|
||||
continue;
|
||||
}
|
||||
|
||||
(*f)(arg, array->data[i]);
|
||||
}
|
||||
}
|
||||
|
|
@ -174,7 +183,7 @@ int zarray_iter(zarray_t* array, zarray_iter_fn_t f, void* arg)
|
|||
xlist_init(&l, 2);
|
||||
xlist_store(&l, f);
|
||||
|
||||
rc = zarray_iter_ex(array, &l, arg);
|
||||
rc = zarray_iter_ex(array, NULL, &l, arg);
|
||||
|
||||
xlist_fini(&l);
|
||||
return rc;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue