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 | |
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>
-rw-r--r-- | epan/dissectors/packet-aeron.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-lbtrm.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-lbtru.c | 2 | ||||
-rw-r--r-- | epan/prefs.c | 10 | ||||
-rw-r--r-- | epan/wmem/wmem_test.c | 2 | ||||
-rw-r--r-- | epan/wmem/wmem_tree.c | 2 | ||||
-rw-r--r-- | epan/wmem/wmem_tree.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 82f5e6abdd..4e5ca5b306 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -1965,7 +1965,7 @@ static void aeron_msg_fragment_add(aeron_msg_t * msg, aeron_msg_fragment_t * fra } } -static gboolean aeron_msg_process_orphan_fragments_msg_cb(void * value, void * userdata) +static gboolean aeron_msg_process_orphan_fragments_msg_cb(const void *key _U_, void * value, void * userdata) { aeron_msg_t * msg = (aeron_msg_t *) value; aeron_term_t * term = (aeron_term_t *) userdata; diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index 135301c4c8..ee2d1c2f03 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1092,7 +1092,7 @@ typedef struct guint32 current_frame; } lbtrm_sqn_frame_list_callback_data_t; -static gboolean dissect_lbtrm_sqn_frame_list_callback(void * frame, void * user_data) +static gboolean dissect_lbtrm_sqn_frame_list_callback(const void *key _U_, void * frame, void * user_data) { lbtrm_sqn_frame_list_callback_data_t * cb_data = (lbtrm_sqn_frame_list_callback_data_t *) user_data; proto_item * transport_item = NULL; diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index 149c0ed1a7..7cef0d1463 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1087,7 +1087,7 @@ typedef struct guint32 current_frame; } lbtru_sqn_frame_list_callback_data_t; -static gboolean dissect_lbtru_sqn_frame_list_callback(void * frame, void * user_data) +static gboolean dissect_lbtru_sqn_frame_list_callback(const void *key _U_, void * frame, void * user_data) { lbtru_sqn_frame_list_callback_data_t * cb_data = (lbtru_sqn_frame_list_callback_data_t *) user_data; proto_item * transport_item = NULL; 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; diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c index d174d6d73a..307125c115 100644 --- a/epan/wmem/wmem_test.c +++ b/epan/wmem/wmem_test.c @@ -131,7 +131,7 @@ wmem_test_cb(wmem_allocator_t *allocator, wmem_cb_event_t event, } static gboolean -wmem_test_foreach_cb(void *value, void *user_data) +wmem_test_foreach_cb(const void *key _U_, void *value, void *user_data) { g_assert(user_data == expected_user_data); diff --git a/epan/wmem/wmem_tree.c b/epan/wmem/wmem_tree.c index aeb6b1b86f..070f951b7d 100644 --- a/epan/wmem/wmem_tree.c +++ b/epan/wmem/wmem_tree.c @@ -674,7 +674,7 @@ wmem_tree_foreach_nodes(wmem_tree_node_t* node, wmem_foreach_func callback, callback, user_data); } else if (!node->is_removed) { /* No callback for "removed" nodes */ - stop_traverse = callback(node->data, user_data); + stop_traverse = callback(node->key, node->data, user_data); } if (stop_traverse) { diff --git a/epan/wmem/wmem_tree.h b/epan/wmem/wmem_tree.h index 2b551a5441..33058c0174 100644 --- a/epan/wmem/wmem_tree.h +++ b/epan/wmem/wmem_tree.h @@ -204,7 +204,7 @@ wmem_tree_lookup32_array_le(wmem_tree_t *tree, wmem_tree_key_t *key); * the value of the node, userdata is whatever was passed to the traversal * function. If the function returns TRUE the traversal will end prematurely. */ -typedef gboolean (*wmem_foreach_func)(void *value, void *userdata); +typedef gboolean (*wmem_foreach_func)(const void *key, void *value, void *userdata); /** Traverse the tree and call callback(value, userdata) for each value found. * Returns TRUE if the traversal was ended prematurely by the callback. |