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-opa-fe.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-opa-fe.c')
| -rw-r--r-- | epan/dissectors/packet-opa-fe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-opa-fe.c b/epan/dissectors/packet-opa-fe.c index b391a8cb44..4b9091af3b 100644 --- a/epan/dissectors/packet-opa-fe.c +++ b/epan/dissectors/packet-opa-fe.c @@ -85,12 +85,12 @@ static int dissect_opa_fe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v return tvb_captured_length(tvb); } -static void range_delete_fe_ssl_callback(guint32 port) +static void range_delete_fe_ssl_callback(guint32 port, gpointer ptr _U_) { ssl_dissector_delete(port, opa_fe_handle); } -static void range_add_fe_ssl_callback(guint32 port) +static void range_add_fe_ssl_callback(guint32 port, gpointer ptr _U_) { ssl_dissector_add(port, opa_fe_handle); } @@ -152,10 +152,10 @@ void proto_reg_handoff_opa_fe(void) initialized = TRUE; } - range_foreach(fe_ssl_range, range_delete_fe_ssl_callback); + range_foreach(fe_ssl_range, range_delete_fe_ssl_callback, NULL); wmem_free(wmem_epan_scope(), fe_ssl_range); fe_ssl_range = range_copy(wmem_epan_scope(), global_fe_ssl_range); - range_foreach(fe_ssl_range, range_add_fe_ssl_callback); + range_foreach(fe_ssl_range, range_add_fe_ssl_callback, NULL); } |