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-netflow.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-netflow.c')
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index d14c99564f..934911924c 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -16667,7 +16667,7 @@ dissect_tcp_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d * protocol/port association */ static void -ipfix_delete_callback(guint32 port) +ipfix_delete_callback(guint32 port, gpointer ptr _U_) { if ( port ) { dissector_delete_uint("udp.port", port, netflow_handle); @@ -16676,7 +16676,7 @@ ipfix_delete_callback(guint32 port) } static void -ipfix_add_callback(guint32 port) +ipfix_add_callback(guint32 port, gpointer ptr _U_) { if ( port ) { dissector_add_uint("udp.port", port, netflow_handle); @@ -16700,7 +16700,7 @@ proto_reg_handoff_netflow(void) } else { dissector_delete_uint_range("udp.port", netflow_ports, netflow_handle); wmem_free(wmem_epan_scope(), netflow_ports); - range_foreach(ipfix_ports, ipfix_delete_callback); + range_foreach(ipfix_ports, ipfix_delete_callback, NULL); wmem_free(wmem_epan_scope(), ipfix_ports); } @@ -16708,7 +16708,7 @@ proto_reg_handoff_netflow(void) ipfix_ports = range_copy(wmem_epan_scope(), global_ipfix_ports); dissector_add_uint_range("udp.port", netflow_ports, netflow_handle); - range_foreach(ipfix_ports, ipfix_add_callback); + range_foreach(ipfix_ports, ipfix_add_callback, NULL); } /* |