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-tcap.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-tcap.c')
| -rw-r--r-- | epan/dissectors/packet-tcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index da884c0328..26b0646750 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -3686,14 +3686,14 @@ proto_register_tcap(void) } -static void range_delete_callback(guint32 ssn) +static void range_delete_callback(guint32 ssn, gpointer ptr _U_) { if ( ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) { dissector_delete_uint("sccp.ssn", ssn, tcap_handle); } } -static void range_add_callback(guint32 ssn) +static void range_add_callback(guint32 ssn, gpointer ptr _U_) { if (ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) { dissector_add_uint("sccp.ssn", ssn, tcap_handle); @@ -3704,7 +3704,7 @@ static void range_add_callback(guint32 ssn) static void init_tcap(void) { 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); /* Reset the session counter */ tcapsrt_global_SessionId=1; @@ -3715,7 +3715,7 @@ static void init_tcap(void) static void cleanup_tcap(void) { - range_foreach(ssn_range, range_delete_callback); + range_foreach(ssn_range, range_delete_callback, NULL); wmem_free(wmem_epan_scope(), ssn_range); } |