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/starter/parser/conf_parser.c | |
| parent | 16bffa8b55542ba7c29fa8b856b26cdcdf2de869 (diff) | |
| download | strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.bz2 strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.xz | |
Migrate all enumerators to venumerate() interface change
Diffstat (limited to 'src/starter/parser/conf_parser.c')
| -rw-r--r-- | src/starter/parser/conf_parser.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/starter/parser/conf_parser.c b/src/starter/parser/conf_parser.c index 6d1c54d20..9f71a0584 100644 --- a/src/starter/parser/conf_parser.c +++ b/src/starter/parser/conf_parser.c @@ -158,10 +158,13 @@ typedef struct { } dictionary_enumerator_t; METHOD(enumerator_t, dictionary_enumerate, bool, - dictionary_enumerator_t *this, char **key, char **value) + dictionary_enumerator_t *this, va_list args) { setting_t *setting; section_t *parent; + char **key, **value; + + VA_ARGS_VGET(args, key, value); while (TRUE) { @@ -221,7 +224,8 @@ METHOD(dictionary_t, dictionary_create_enumerator, enumerator_t*, INIT(enumerator, .public = { - .enumerate = (void*)_dictionary_enumerate, + .enumerate = enumerator_enumerate_default, + .venumerate = _dictionary_enumerate, .destroy = _dictionary_enumerator_destroy, }, .seen = hashtable_create(hashtable_hash_str, hashtable_equals_str, 8), |