aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/addr_resolv.c2
-rw-r--r--epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c12
-rw-r--r--epan/dissectors/asn1/camel/packet-camel-template.c8
-rw-r--r--epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c8
-rw-r--r--epan/dissectors/asn1/inap/packet-inap-template.c8
-rw-r--r--epan/dissectors/asn1/tcap/packet-tcap-template.c8
-rw-r--r--epan/dissectors/packet-ansi_map.c12
-rw-r--r--epan/dissectors/packet-camel.c8
-rw-r--r--epan/dissectors/packet-gsm_map.c8
-rw-r--r--epan/dissectors/packet-h264.c8
-rw-r--r--epan/dissectors/packet-http.c8
-rw-r--r--epan/dissectors/packet-inap.c8
-rw-r--r--epan/dissectors/packet-netflow.c8
-rw-r--r--epan/dissectors/packet-opa-fe.c8
-rw-r--r--epan/dissectors/packet-tcap.c8
-rw-r--r--epan/dissectors/packet-vp8.c8
-rw-r--r--epan/range.c16
-rw-r--r--epan/range.h12
18 files changed, 70 insertions, 88 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 26366fd40d..7fcc266fcc 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -522,7 +522,7 @@ parse_service_line (char *line)
}
cb_data.service = service;
cb_data.proto = proto;
- range_foreach_r(port_rng, add_serv_port_cb, &cb_data);
+ range_foreach(port_rng, add_serv_port_cb, &cb_data);
}
wmem_free (NULL, port_rng);
diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c
index 67f43eae93..980d806e92 100644
--- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c
+++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c
@@ -4429,17 +4429,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);
}
}
@@ -4553,13 +4553,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 -------------------------------------------*/
diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c
index bc463d59e7..ea9192356a 100644
--- a/epan/dissectors/asn1/camel/packet-camel-template.c
+++ b/epan/dissectors/asn1/camel/packet-camel-template.c
@@ -1282,14 +1282,14 @@ camel_stat_free_table_item(stat_tap_table* table _U_, guint row _U_, guint colum
}
/*--- proto_reg_handoff_camel ---------------------------------------*/
-static void range_delete_callback(guint32 ssn)
+static void range_delete_callback(guint32 ssn, gpointer ptr _U_)
{
if (ssn) {
delete_itu_tcap_subdissector(ssn, camel_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, camel_handle);
@@ -1317,13 +1317,13 @@ void proto_reg_handoff_camel(void) {
#include "packet-camel-dis-tab.c"
} 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);
}
diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
index ab20ed3ac1..c8fd423354 100644
--- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
+++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
@@ -2689,14 +2689,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);
@@ -2826,12 +2826,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);
}
diff --git a/epan/dissectors/asn1/inap/packet-inap-template.c b/epan/dissectors/asn1/inap/packet-inap-template.c
index 16b7e543f5..24f0bf964d 100644
--- a/epan/dissectors/asn1/inap/packet-inap-template.c
+++ b/epan/dissectors/asn1/inap/packet-inap-template.c
@@ -156,14 +156,14 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *d
}
/*--- proto_reg_handoff_inap ---------------------------------------*/
-static void range_delete_callback(guint32 ssn)
+static void range_delete_callback(guint32 ssn, gpointer ptr _U_)
{
if (ssn) {
delete_itu_tcap_subdissector(ssn, inap_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, inap_handle);
@@ -184,13 +184,13 @@ void proto_reg_handoff_inap(void) {
oid_add_from_string("iso(1) member-body(2) gb(826) national(0) ericsson(1249) inDomain(51) inNetwork(1) inNetworkcapabilitySet1plus(1) ","1.2.826.0.1249.51.1.1");
}
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);
}
diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.c b/epan/dissectors/asn1/tcap/packet-tcap-template.c
index 576f78da9d..6b16c71caa 100644
--- a/epan/dissectors/asn1/tcap/packet-tcap-template.c
+++ b/epan/dissectors/asn1/tcap/packet-tcap-template.c
@@ -2088,14 +2088,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);
@@ -2106,7 +2106,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;
@@ -2117,7 +2117,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);
}
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 -------------------------------------------*/
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index db7be2b10e..7dc3d517d3 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -8243,14 +8243,14 @@ camel_stat_free_table_item(stat_tap_table* table _U_, guint row _U_, guint colum
}
/*--- proto_reg_handoff_camel ---------------------------------------*/
-static void range_delete_callback(guint32 ssn)
+static void range_delete_callback(guint32 ssn, gpointer ptr _U_)
{
if (ssn) {
delete_itu_tcap_subdissector(ssn, camel_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, camel_handle);
@@ -8286,13 +8286,13 @@ void proto_reg_handoff_camel(void) {
/*--- End of included file: packet-camel-dis-tab.c ---*/
#line 1319 "./asn1/camel/packet-camel-template.c"
} 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);
}
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);
}
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index ad6be322d0..a619adf977 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -2714,12 +2714,12 @@ dissect_h264_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, void*
}
-static void range_delete_h264_rtp_pt_callback(guint32 rtp_pt) {
+static void range_delete_h264_rtp_pt_callback(guint32 rtp_pt, gpointer ptr _U_) {
if (rtp_pt >= 96 && rtp_pt <= 127)
dissector_delete_uint("rtp.pt", rtp_pt, h264_handle);
}
-static void range_add_h264_rtp_pt_callback(guint32 rtp_pt) {
+static void range_add_h264_rtp_pt_callback(guint32 rtp_pt, gpointer ptr _U_) {
if (rtp_pt >= 96 && rtp_pt <= 127)
dissector_add_uint("rtp.pt", rtp_pt, h264_handle);
}
@@ -3729,12 +3729,12 @@ proto_reg_handoff_h264(void)
}
h264_prefs_initialized = TRUE;
} else {
- range_foreach(dynamic_payload_type_range, range_delete_h264_rtp_pt_callback);
+ range_foreach(dynamic_payload_type_range, range_delete_h264_rtp_pt_callback, NULL);
wmem_free(wmem_epan_scope(), dynamic_payload_type_range);
}
dynamic_payload_type_range = range_copy(wmem_epan_scope(), temp_dynamic_payload_type_range);
- range_foreach(dynamic_payload_type_range, range_add_h264_rtp_pt_callback);
+ range_foreach(dynamic_payload_type_range, range_add_h264_rtp_pt_callback, NULL);
}
/*
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index a77bfe6b27..84b3e91a73 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -3300,12 +3300,12 @@ dissect_ssdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
}
static void
-range_delete_http_ssl_callback(guint32 port) {
+range_delete_http_ssl_callback(guint32 port, gpointer ptr _U_) {
ssl_dissector_delete(port, http_ssl_handle);
}
static void
-range_add_http_ssl_callback(guint32 port) {
+range_add_http_ssl_callback(guint32 port, gpointer ptr _U_) {
ssl_dissector_add(port, http_ssl_handle);
}
@@ -3317,10 +3317,10 @@ static void reinit_http(void) {
http_sctp_range = range_copy(wmem_epan_scope(), global_http_sctp_range);
dissector_add_uint_range("sctp.port", http_sctp_range, http_sctp_handle);
- range_foreach(http_ssl_range, range_delete_http_ssl_callback);
+ range_foreach(http_ssl_range, range_delete_http_ssl_callback, NULL);
wmem_free(wmem_epan_scope(), http_ssl_range);
http_ssl_range = range_copy(wmem_epan_scope(), global_http_ssl_range);
- range_foreach(http_ssl_range, range_add_http_ssl_callback);
+ range_foreach(http_ssl_range, range_add_http_ssl_callback, NULL);
}
void
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 2e619c0697..9e4f6a82f6 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -9393,14 +9393,14 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *d
}
/*--- proto_reg_handoff_inap ---------------------------------------*/
-static void range_delete_callback(guint32 ssn)
+static void range_delete_callback(guint32 ssn, gpointer ptr _U_)
{
if (ssn) {
delete_itu_tcap_subdissector(ssn, inap_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, inap_handle);
@@ -9421,13 +9421,13 @@ void proto_reg_handoff_inap(void) {
oid_add_from_string("iso(1) member-body(2) gb(826) national(0) ericsson(1249) inDomain(51) inNetwork(1) inNetworkcapabilitySet1plus(1) ","1.2.826.0.1249.51.1.1");
}
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);
}
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);
}
/*
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);
}
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);
}
diff --git a/epan/dissectors/packet-vp8.c b/epan/dissectors/packet-vp8.c
index 9c38dcaf33..992b7fccba 100644
--- a/epan/dissectors/packet-vp8.c
+++ b/epan/dissectors/packet-vp8.c
@@ -583,13 +583,13 @@ proto_register_vp8(void)
}
static void
-range_delete_vp8_rtp_pt_callback(guint32 rtp_pt) {
+range_delete_vp8_rtp_pt_callback(guint32 rtp_pt, gpointer ptr _U_) {
if ((rtp_pt >= 96) && (rtp_pt <= 127))
dissector_delete_uint("rtp.pt", rtp_pt, vp8_handle);
}
static void
-range_add_vp8_rtp_pt_callback(guint32 rtp_pt) {
+range_add_vp8_rtp_pt_callback(guint32 rtp_pt, gpointer ptr _U_) {
if ((rtp_pt >= 96) && (rtp_pt <= 127))
dissector_add_uint("rtp.pt", rtp_pt, vp8_handle);
}
@@ -604,12 +604,12 @@ proto_reg_handoff_vp8(void)
dissector_add_string("rtp_dyn_payload_type" , "VP8", vp8_handle);
vp8_prefs_initialized = TRUE;
} else {
- range_foreach(dynamic_payload_type_range, range_delete_vp8_rtp_pt_callback);
+ range_foreach(dynamic_payload_type_range, range_delete_vp8_rtp_pt_callback, NULL);
wmem_free(wmem_epan_scope(), dynamic_payload_type_range);
}
dynamic_payload_type_range = range_copy(wmem_epan_scope(), temp_dynamic_payload_type_range);
- range_foreach(dynamic_payload_type_range, range_add_vp8_rtp_pt_callback);
+ range_foreach(dynamic_payload_type_range, range_add_vp8_rtp_pt_callback, NULL);
}
/*
diff --git a/epan/range.c b/epan/range.c
index f1e8e1d950..66c4cf46fe 100644
--- a/epan/range.c
+++ b/epan/range.c
@@ -402,26 +402,14 @@ ranges_are_equal(range_t *a, range_t *b)
* in the range.
*/
void
-range_foreach(range_t *range, void (*callback)(guint32 val))
+range_foreach(range_t *range, void (*callback)(guint32 val, gpointer ptr), gpointer ptr)
{
guint32 i, j;
if (range && callback) {
for (i=0; i < range->nranges; i++) {
for (j = range->ranges[i].low; j <= range->ranges[i].high; j++)
- callback(j);
- }
- }
-}
-
-void range_foreach_r(range_t *range, void (*callback2)(guint32 val, gpointer ptr), gpointer ptr)
-{
- guint32 i, j;
-
- if (range && callback2) {
- for (i=0; i < range->nranges; i++) {
- for (j = range->ranges[i].low; j <= range->ranges[i].high; j++)
- callback2(j, ptr);
+ callback(j, ptr);
}
}
}
diff --git a/epan/range.h b/epan/range.h
index 2e440b30ef..e61550a90a 100644
--- a/epan/range.h
+++ b/epan/range.h
@@ -131,19 +131,13 @@ WS_DLL_PUBLIC gboolean range_remove_value(wmem_allocator_t *scope, range_t **ran
WS_DLL_PUBLIC gboolean ranges_are_equal(range_t *a, range_t *b);
/** This function calls the provided callback function for each value in
- * in the range.
+ * in the range. Takes a pointer argument, which is passed to the
+ * callback, along with the value in the range.
* @param range the range
* @param callback the callback function
- */
-WS_DLL_PUBLIC void range_foreach(range_t *range, void (*callback)(guint32 val));
-
-/** This function calls the provided callback function for each value in
- * in the range. Takes an optional pointer argument.
- * @param range the range
- * @param callback2 the callback function
* @param ptr pointer passed to the callback
*/
-WS_DLL_PUBLIC void range_foreach_r(range_t *range, void (*callback2)(guint32 val, gpointer ptr), gpointer ptr);
+WS_DLL_PUBLIC void range_foreach(range_t *range, void (*callback)(guint32 val, gpointer ptr), gpointer ptr);
/**
* This function converts a range_t to a (wmem_alloc()-allocated) string.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:32:53 +0000