From 01f2e2b2012e09210104910646feee98128b458f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 8 Aug 2017 15:05:37 -0700 Subject: We really only need one range_foreach routine. Rename range_foreach_r() to range_foreach(), getting rid of the old range_foreach(). If your callback doesn't require an additional argument, just pass NULL when calling range_foreach(), and declare the argument as unused. Change-Id: I49a56f90610e39cf2ddc398c9e30ed11a6ca90db Reviewed-on: https://code.wireshark.org/review/23025 Reviewed-by: Guy Harris --- epan/dissectors/packet-gsm_map.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-gsm_map.c') diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 8ca18e904a..65a2d2b8fa 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -23348,14 +23348,14 @@ gsm_map_stat_free_table_item(stat_tap_table* table _U_, guint row _U_, guint col } /*--- proto_reg_handoff_gsm_map ---------------------------------------*/ -static void range_delete_callback(guint32 ssn) +static void range_delete_callback(guint32 ssn, gpointer ptr _U_) { if (ssn) { delete_itu_tcap_subdissector(ssn, map_handle); } } -static void range_add_callback(guint32 ssn) +static void range_add_callback(guint32 ssn, gpointer ptr _U_) { if (ssn) { add_itu_tcap_subdissector(ssn, map_handle); @@ -23485,12 +23485,12 @@ void proto_reg_handoff_gsm_map(void) { register_ber_oid_dissector("1.3.12.2.1107.3.66.1.6",dissect_NokiaMAP_ext_AllowedServiceData,proto_gsm_map,"Nokia AllowedServiceData Extension"); } else { - range_foreach(ssn_range, range_delete_callback); + range_foreach(ssn_range, range_delete_callback, NULL); wmem_free(wmem_epan_scope(), ssn_range); } ssn_range = range_copy(wmem_epan_scope(), global_ssn_range); - range_foreach(ssn_range, range_add_callback); + range_foreach(ssn_range, range_add_callback, NULL); } -- cgit v1.2.3