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/libstrongswan/credentials/sets/callback_cred.c | |
| parent | 16bffa8b55542ba7c29fa8b856b26cdcdf2de869 (diff) | |
| download | strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.bz2 strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.xz | |
Migrate all enumerators to venumerate() interface change
Diffstat (limited to 'src/libstrongswan/credentials/sets/callback_cred.c')
| -rw-r--r-- | src/libstrongswan/credentials/sets/callback_cred.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libstrongswan/credentials/sets/callback_cred.c b/src/libstrongswan/credentials/sets/callback_cred.c index bff33f029..0d72452da 100644 --- a/src/libstrongswan/credentials/sets/callback_cred.c +++ b/src/libstrongswan/credentials/sets/callback_cred.c @@ -60,9 +60,12 @@ typedef struct { } shared_enumerator_t; METHOD(enumerator_t, shared_enumerate, bool, - shared_enumerator_t *this, shared_key_t **out, - id_match_t *match_me, id_match_t *match_other) + shared_enumerator_t *this, va_list args) { + shared_key_t **out; + id_match_t *match_me, *match_other; + + VA_ARGS_VGET(args, out, match_me, match_other); DESTROY_IF(this->current); this->current = this->this->cb.shared(this->this->data, this->type, this->me, this->other, match_me, match_other); @@ -89,7 +92,8 @@ METHOD(credential_set_t, create_shared_enumerator, enumerator_t*, INIT(enumerator, .public = { - .enumerate = (void*)_shared_enumerate, + .enumerate = enumerator_enumerate_default, + .venumerate = _shared_enumerate, .destroy = _shared_destroy, }, .this = this, |