diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-05-11 09:17:02 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-26 13:56:44 +0200 |
| commit | 95a63bf2813cd6ecad912237688526bbcc3481ee (patch) | |
| tree | ab656955ac9380b54fe6becaca3ca97a9c7549c4 /src/libcharon/attributes/mem_pool.c | |
| parent | 16bffa8b55542ba7c29fa8b856b26cdcdf2de869 (diff) | |
| download | strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.bz2 strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.xz | |
Migrate all enumerators to venumerate() interface change
Diffstat (limited to 'src/libcharon/attributes/mem_pool.c')
| -rw-r--r-- | src/libcharon/attributes/mem_pool.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/libcharon/attributes/mem_pool.c b/src/libcharon/attributes/mem_pool.c index a2b7c2803..e1a9a6dce 100644 --- a/src/libcharon/attributes/mem_pool.c +++ b/src/libcharon/attributes/mem_pool.c @@ -512,10 +512,15 @@ typedef struct { } lease_enumerator_t; METHOD(enumerator_t, lease_enumerate, bool, - lease_enumerator_t *this, identification_t **id, host_t **addr, bool *online) + lease_enumerator_t *this, va_list args) { - u_int *offset; + identification_t **id; unique_lease_t *lease; + host_t **addr; + u_int *offset; + bool *online; + + VA_ARGS_VGET(args, id, addr, online); DESTROY_IF(this->addr); this->addr = NULL; @@ -570,7 +575,8 @@ METHOD(mem_pool_t, create_lease_enumerator, enumerator_t*, this->mutex->lock(this->mutex); INIT(enumerator, .public = { - .enumerate = (void*)_lease_enumerate, + .enumerate = enumerator_enumerate_default, + .venumerate = _lease_enumerate, .destroy = _lease_enumerator_destroy, }, .pool = this, |