diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2015-11-10 12:30:25 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-11 00:22:37 +0000 |
| commit | c2afc9edec79b247d02f42ba3c7cad2bc24b9f91 (patch) | |
| tree | 29ee4f300505e68f3366c1e244226a167cddbaf5 /epan/prefs.c | |
| parent | b9b74fcf57375209a8716434c5998168e44b57ca (diff) | |
Change prototype of callbacks passed to wmem_tree_foreach so that they
accept the node key as a first parameter.
wmem_tree accepts all sort of keys (strings, integers, soon ranges),
thus it is of interest for various purposes (testing, greedy search) to
know the key of the node.
Change-Id: Ie748b917bef91f0b1ba8cce15bd1b471922641dc
Reviewed-on: https://code.wireshark.org/review/11683
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index ad8bf5760f..e9ecf29879 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -634,7 +634,7 @@ typedef struct { } call_foreach_t; static gboolean -call_foreach_cb(void *value, void *data) +call_foreach_cb(const void *key _U_, void *value, void *data) { module_t *module = (module_t*)value; call_foreach_t *call_data = (call_foreach_t*)data; @@ -710,7 +710,7 @@ prefs_modules_foreach_submodules(module_t *module, module_cb callback, } static gboolean -call_apply_cb(void *value, void *data _U_) +call_apply_cb(const void *key _U_, void *value, void *data _U_) { module_t *module = (module_t *)value; @@ -746,7 +746,7 @@ void prefs_apply(module_t *module) { if (module && module->prefs_changed) - call_apply_cb(module, NULL); + call_apply_cb(NULL, module, NULL); } /* @@ -839,7 +839,7 @@ preference_match(gconstpointer a, gconstpointer b) } static gboolean -module_find_pref_cb(void *value, void *data) +module_find_pref_cb(const void *key _U_, void *value, void *data) { find_pref_arg_t* arg = (find_pref_arg_t*)data; GList *list_entry; @@ -3170,7 +3170,7 @@ typedef struct { * Reset all preferences for a module. */ static gboolean -reset_module_prefs(void *value, void *data _U_) +reset_module_prefs(const void *key _U_, void *value, void *data _U_) { reset_pref_arg_t arg; |