diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-08-08 15:05:37 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-08-08 22:06:27 +0000 |
commit | 01f2e2b2012e09210104910646feee98128b458f (patch) | |
tree | e0124cda8c631ca321d7c6ce65c9fad83d7c18ee /epan/dissectors/packet-ansi_map.c | |
parent | 3bcd0e142a3540ed8fa7a339728d0c10bacadcc8 (diff) |
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 <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ansi_map.c')
-rw-r--r-- | epan/dissectors/packet-ansi_map.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 5cd6d2dad3..c999f1ce48 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -16078,17 +16078,17 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data return tvb_captured_length(tvb); } -static void range_delete_callback(guint32 ssn) +static void range_delete_callback(guint32 ssn, gpointer ptr _U_) { if (ssn) { - delete_ansi_tcap_subdissector(ssn , ansi_map_handle); + delete_ansi_tcap_subdissector(ssn, ansi_map_handle); } } -static void range_add_callback(guint32 ssn) +static void range_add_callback(guint32 ssn, gpointer ptr _U_) { if (ssn) { - add_ansi_tcap_subdissector(ssn , ansi_map_handle); + add_ansi_tcap_subdissector(ssn, ansi_map_handle); } } @@ -16202,13 +16202,13 @@ proto_reg_handoff_ansi_map(void) } 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); } /*--- proto_register_ansi_map -------------------------------------------*/ |