diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index ac831dc877..f911d9a495 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -5806,7 +5806,7 @@ fCalendarEntry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset } static guint -fEventTimeStamps( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) +fEventTimeStamps( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { guint32 lvt = 0; proto_tree* subtree = tree; @@ -6576,7 +6576,7 @@ moduloDivide [1] Unsigned } */ static guint -fPrescale(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) +fPrescale(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { guint8 tag_no, tag_info; guint32 lvt; @@ -6610,7 +6610,7 @@ integerScale [1] INTEGER } */ static guint -fScale(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) +fScale(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { guint8 tag_no, tag_info; guint32 lvt; @@ -6651,7 +6651,7 @@ BACnetAccumulatorRecord ::= SEQUENCE { } */ static guint -fLoggingRecord(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) +fLoggingRecord(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { guint8 tag_no, tag_info; guint32 lvt; @@ -7532,7 +7532,7 @@ BACnetPropertyStatesEnums[] = { #define BACnetPropertyStatesEnums_Size 36 static guint -fBACnetPropertyStates(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) +fBACnetPropertyStates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { guint8 tag_no, tag_info; guint32 lvt; diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 7fc4c126ff..ab28a7983a 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -3397,7 +3397,7 @@ static void dissect_batadv_tt_query(tvbuff_t *tvb, packet_info *pinfo, proto_tre } } -static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { struct tt_query_packet_v14 *tt_query_packeth; proto_tree *batadv_tt_query_tree = NULL; @@ -3959,7 +3959,7 @@ static void dissect_batadv_tvlv_v15_header(tvbuff_t *tvb, ENC_BIG_ENDIAN); } -static void dissect_batadv_tvlv_v15_dat(tvbuff_t *tvb, packet_info *pinfo _U_, +static void dissect_batadv_tvlv_v15_dat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 version) { @@ -3983,7 +3983,7 @@ static void dissect_batadv_tvlv_v15_nc(tvbuff_t *tvb, packet_info *pinfo, } } -static void dissect_batadv_tvlv_v15_mcast(tvbuff_t *tvb, packet_info *pinfo _U_, +static void dissect_batadv_tvlv_v15_mcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 version) { @@ -4007,7 +4007,7 @@ static void dissect_batadv_tvlv_v15_mcast(tvbuff_t *tvb, packet_info *pinfo _U_, /* 3 byte of padding. */ } -static void dissect_batadv_tvlv_v15_gw(tvbuff_t *tvb, packet_info *pinfo _U_, +static void dissect_batadv_tvlv_v15_gw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 version) { @@ -4032,7 +4032,7 @@ static void dissect_batadv_tvlv_v15_gw(tvbuff_t *tvb, packet_info *pinfo _U_, up / 10, up % 10); } -static void dissect_batadv_tvlv_v15_roam(tvbuff_t *tvb, packet_info *pinfo _U_, +static void dissect_batadv_tvlv_v15_roam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 version) { diff --git a/epan/dissectors/packet-bencode.c b/epan/dissectors/packet-bencode.c index bf361b6b6c..bb44bc27ea 100644 --- a/epan/dissectors/packet-bencode.c +++ b/epan/dissectors/packet-bencode.c @@ -116,7 +116,7 @@ static int dissect_bencoding_str(tvbuff_t *tvb, packet_info *pinfo, return -1; } -static int dissect_bencoding_int(tvbuff_t *tvb, packet_info *pinfo _U_, +static int dissect_bencoding_int(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto_tree *tree, proto_item *ti, int treeadd) { gint32 ival = 0; @@ -177,7 +177,7 @@ static int dissect_bencoding_int(tvbuff_t *tvb, packet_info *pinfo _U_, return -1; } -static int dissect_bencoding_rec(tvbuff_t *tvb, packet_info *pinfo _U_, +static int dissect_bencoding_rec(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto_tree *tree, int level, proto_item *treei, int treeadd) { guint8 op; diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 6ef738b436..c2e4714836 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -419,7 +419,7 @@ static gboolean ber_decode_as_change(const char *name _U_, gconstpointer pattern } int -dissect_ber_oid_NULL_callback(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void* data _U_) +dissect_ber_oid_NULL_callback(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, void* data _U_) { return tvb_captured_length(tvb); } @@ -2061,7 +2061,7 @@ dissect_ber_boolean(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, t /* 8.5 Encoding of a real value */ /* Somewhat tested */ int -dissect_ber_real(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id _U_, double *value) +dissect_ber_real(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, double *value) { gint8 ber_class; gboolean pc; @@ -4121,7 +4121,7 @@ dissect_ber_INTEGER(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t } static int -dissect_ber_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) +dissect_ber_T_octet_aligned(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index) { if (actx->external.u.ber.ber_callback) { offset = actx->external.u.ber.ber_callback(FALSE, tvb, offset, actx, tree, hf_index); @@ -4145,7 +4145,7 @@ dissect_ber_OBJECT_IDENTIFIER(gboolean implicit_tag, tvbuff_t *tvb, int offset, } static int -dissect_ber_ObjectDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) +dissect_ber_ObjectDescriptor(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index) { DISSECTOR_ASSERT(actx); offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_ObjectDescriptor, @@ -4156,7 +4156,7 @@ dissect_ber_ObjectDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } static int -dissect_ber_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) +dissect_ber_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index) { if (actx->external.u.ber.ber_callback) { offset = actx->external.u.ber.ber_callback(FALSE, tvb, offset, actx, tree, hf_index); @@ -4168,7 +4168,7 @@ dissect_ber_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } static int -dissect_ber_T_arbitrary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) +dissect_ber_T_arbitrary(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index) { if (actx->external.u.ber.ber_callback) { offset = actx->external.u.ber.ber_callback(FALSE, tvb, offset, actx, tree, hf_index); @@ -4213,7 +4213,7 @@ static const ber_sequence_t external_U_sequence[] = { { NULL, 0, 0, 0, NULL } }; static int -dissect_ber_external_U(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_ , proto_tree *tree, int hf_index _U_) +dissect_ber_external_U(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx , proto_tree *tree, int hf_index) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, external_U_sequence, hf_index, ett_ber_EXTERNAL); diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c index 159430ad8a..f8874c3716 100644 --- a/epan/dissectors/packet-bfcp.c +++ b/epan/dissectors/packet-bfcp.c @@ -423,7 +423,7 @@ dissect_bfcp_heur_check(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* Code to actually dissect BFCP packets */ static int -dissect_bfcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) +dissect_bfcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { int offset = 0; guint8 primitive; @@ -486,7 +486,7 @@ dissect_bfcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } static gboolean -dissect_bfcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_bfcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if (!dissect_bfcp_heur_check(tvb, pinfo, tree, data)) return FALSE; diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index d0155786eb..b070b44325 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -493,7 +493,7 @@ dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static int -dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; int i; diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 12a6dbff55..e4ea0c2a2a 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1866,7 +1866,7 @@ dissect_bluetooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat * metadata header in the packet. */ static gint -dissect_bluetooth_bthci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_bluetooth_bthci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { bluetooth_data_t *bluetooth_data; @@ -1894,7 +1894,7 @@ dissect_bluetooth_bthci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi * metadata header in the packet. */ static gint -dissect_bluetooth_btmon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_bluetooth_btmon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { bluetooth_data_t *bluetooth_data; diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index 12bf423fb4..821bbed094 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -133,7 +133,7 @@ dissect_bmc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } static int -dissect_bmc_cbs_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +dissect_bmc_cbs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tvbuff_t *cell_broadcast_tvb; gint offset = 1; diff --git a/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c index 5ef6e01b59..14399d21cc 100644 --- a/epan/dissectors/packet-bpq.c +++ b/epan/dissectors/packet-bpq.c @@ -103,7 +103,7 @@ dissect_bpq( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d } static gboolean -capture_bpq( const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) +capture_bpq( const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header) { int l_offset; diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 82c05ce0a5..97f13e525b 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -597,7 +597,7 @@ static const value_string tab_nacc_cause[]={ * 11.3.1 Alignment octets */ static guint16 -de_bssgp_aligment_octets(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_aligment_octets(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -672,7 +672,7 @@ de_bssgp_bvc_bucket_size(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * 11.3.6 BVCI (BSSGP Virtual Connection Identifier) */ static guint16 -de_bssgp_bvci(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_bvci(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string, int string_len) { guint32 curr_offset; guint16 bvci; @@ -856,7 +856,7 @@ de_bssgp_cell_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of * value part of the Channel Needed IE defined in 3GPP TS 44.018. */ static guint16 -de_bssgp_chnl_needed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_chnl_needed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -894,7 +894,7 @@ static const value_string bssgp_flush_action_vals[] = { }; static guint16 -de_bssgp_flush_action(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_flush_action(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string, int string_len) { guint32 curr_offset; guint8 oct; @@ -951,7 +951,7 @@ de_bssgp_llc_pdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of * 11.3.16 LLC Frames Discarded */ static guint16 -de_bssgp_llc_frames_disc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_llc_frames_disc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string, int string_len) { guint32 curr_offset; guint8 oct; @@ -1024,7 +1024,7 @@ de_bssgp_ms_bucket_size(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * 11.3.23 OMC Id */ static guint16 -de_bssgp_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -1039,7 +1039,7 @@ de_bssgp_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * 11.3.24 PDU In Error */ static guint16 -de_bssgp_pdu_in_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_pdu_in_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -1345,7 +1345,7 @@ de_bssgp_trace_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin * XXX: Coding unknown (Specification withdrawn) 3GPP TS 32.008 */ static guint16 -de_bssgp_trace_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_trace_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset = offset; @@ -1371,7 +1371,7 @@ de_bssgp_transaction_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * 11.3.40 Trigger Id */ static guint16 -de_bssgp_trigger_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_trigger_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -1385,7 +1385,7 @@ de_bssgp_trigger_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * 11.3.41 Number of octets affected */ static guint16 -de_bssgp_no_of_oct_affected(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_no_of_oct_affected(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string, int string_len) { guint32 curr_offset; guint32 no_of_oct; @@ -1561,7 +1561,7 @@ de_bssgp_nsei(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse * 11.3.49 RRLP APDU */ static guint16 -de_bssgp_rrlp_apdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_rrlp_apdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *next_tvb=NULL; guint32 curr_offset; @@ -1747,7 +1747,7 @@ de_bssgp_rim_seq_no(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui static guint16 -de_bssgp_ran_information_request_app_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_information_request_app_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { tvbuff_t *new_tvb = NULL; int curr_offset, bit_offset; @@ -1819,7 +1819,7 @@ static const value_string bssgp_rat_discriminator_vals[] = { { 0, NULL }, }; static guint16 -de_bssgp_ran_information_app_cont_unit(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_information_app_cont_unit(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { tvbuff_t *new_tvb = NULL; guint32 curr_offset; @@ -1998,7 +1998,7 @@ static const value_string bssgp_utra_si_cause_vals[] = { }; static guint16 -de_bssgp_ran_app_error_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_app_error_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *new_tvb = NULL; guint32 curr_offset; @@ -2162,7 +2162,7 @@ de_bssgp_rim_proto_ver_no(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U */ static guint16 -de_bssgp_pfc_flow_ctrl(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_pfc_flow_ctrl(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { proto_tree *pfc_tree; @@ -2233,7 +2233,7 @@ static const value_string bssgp_ra_discriminator_vals[] = { }; static guint16 -de_bssgp_rim_routing_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_rim_routing_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { guint8 oct; guint16 rnc_id; @@ -2323,7 +2323,7 @@ de_bssgp_mbms_session_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * 11.3.72 MBMS Session Duration */ static guint16 -de_bssgp_mbms_session_dur(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_mbms_session_dur(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -2422,7 +2422,7 @@ static const value_string bssgp_mbms_num_ra_ids_vals[] = { static value_string_ext bssgp_mbms_num_ra_ids_vals_ext = VALUE_STRING_EXT_INIT(bssgp_mbms_num_ra_ids_vals); static guint16 -de_bssgp_mbms_ra_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_mbms_ra_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { proto_tree *rai_tree; guint32 curr_offset; @@ -2531,7 +2531,7 @@ de_bssgp_mbms_stop_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * 11.3.82 PFCs to be set-up list */ static guint16 -de_bssgp_pfcs_to_be_set_up_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_pfcs_to_be_set_up_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { proto_tree *pfc_tree, *pft_tree, *abqp_tree, *arp_tree, *t10_tree; @@ -2605,7 +2605,7 @@ de_bssgp_pfcs_to_be_set_up_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pi * 11.3.83 List of set-up PFCs */ static guint16 -de_bssgp_list_of_setup_pfcs(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_list_of_setup_pfcs(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { proto_tree *pfc_tree; @@ -2658,7 +2658,7 @@ de_bssgp_ext_feature_bitmap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo * 11.3.85 Source to Target Transparent Container */ static guint16 -de_bssgp_src_to_trg_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_src_to_trg_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -2678,7 +2678,7 @@ de_bssgp_src_to_trg_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi * 11.3.86 Target to Source Transparent Container */ static guint16 -de_bssgp_trg_to_src_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_trg_to_src_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -2701,7 +2701,7 @@ de_bssgp_trg_to_src_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi * 11.3.87 RNC Identifier */ static guint16 -de_bssgp_rnc_identifier(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_rnc_identifier(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string, int string_len) { guint32 curr_offset; guint16 rnc_id; @@ -2819,7 +2819,7 @@ de_bssgp_global_tfi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * 11.3.92 Time to MBMS Data Transfer */ static guint16 -de_bssgp_time_to_MBMS_data_tran(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_time_to_MBMS_data_tran(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint8 value; @@ -2836,7 +2836,7 @@ de_bssgp_time_to_MBMS_data_tran(tvbuff_t *tvb, proto_tree *tree, packet_info *pi * 11.3.93 MBMS Session Repetition Number */ static guint16 -de_bssgp_mbms_session_rep_no(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_mbms_session_rep_no(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -2851,7 +2851,7 @@ de_bssgp_mbms_session_rep_no(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo * 11.3.94 Inter RAT Handover Info */ static guint16 -de_bssgp_inter_rat_ho_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_inter_rat_ho_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -2871,7 +2871,7 @@ de_bssgp_inter_rat_ho_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * 11.3.95 PS Handover Command */ static guint16 -de_bssgp_ps_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ps_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -2949,7 +2949,7 @@ de_bssgp_sipsi_container(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * 11.3.95c Active PFCs List */ static guint16 -de_bssgp_active_pfcs_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_active_pfcs_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { proto_tree *pfc_tree; @@ -2984,7 +2984,7 @@ de_bssgp_active_pfcs_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U * 11.3.96 Velocity Data */ static guint16 -de_bssgp_velocity_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) +de_bssgp_velocity_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { guint32 curr_offset; @@ -3002,7 +3002,7 @@ de_bssgp_velocity_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * 11.3.97 DTM Handover Command */ static guint16 -de_bssgp_dtm_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_dtm_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -3087,7 +3087,7 @@ de_bssgp_flow_control_gran(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * 11.3.103 eNB Identifier */ static guint16 -de_bssgp_enb_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string, int string_len) +de_bssgp_enb_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -3110,7 +3110,7 @@ de_bssgp_enb_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off * 11.3.104 E-UTRAN Inter RAT Handover Info */ static guint16 -de_bssgp_e_utran_inter_rat_ho_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_e_utran_inter_rat_ho_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -3187,7 +3187,7 @@ de_bssgp_reliable_inter_rat_ho_inf(tvbuff_t *tvb, proto_tree *tree, packet_info * 11.3.108 SON Transfer Application Identity */ static guint16 -de_bssgp_son_transfer_app_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset _U_, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_son_transfer_app_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *next_tvb; @@ -3332,7 +3332,7 @@ de_bssgp_unconfim_send_state_var(tvbuff_t *tvb, proto_tree *tree, packet_info *p * 11.3.118 Selected PLMN ID */ static guint16 -de_bssgp_selected_plmn_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_selected_plmn_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { proto_tree_add_string(tree, hf_bssgp_selected_plmn_id, tvb, offset, 3, dissect_e212_mcc_mnc_wmem_packet_str(tvb, pinfo, tree, offset, E212_NONE, TRUE)); return 3; @@ -3609,7 +3609,7 @@ value_string_ext bssgp_elem_strings_ext = VALUE_STRING_EXT_INIT(bssgp_elem_strin gint ett_bssgp_elem[NUM_BSSGP_ELEM]; -guint16 (*bssgp_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { +guint16 (*bssgp_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) = { de_bssgp_aligment_octets, /* 11.3.1 0x00 Alignment octets */ de_bssgp_bmax_default_ms, /* 11.3.2 0x01 Bmax default MS */ de_bssgp_bss_area_ind, /* 11.3.3 0x02 BSS Area Indication */ @@ -3727,7 +3727,7 @@ guint16 (*bssgp_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo * 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container */ static guint16 -de_bssgp_ran_inf_request_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_inf_request_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; @@ -3758,7 +3758,7 @@ de_bssgp_ran_inf_request_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info * * 11.3.62a.2 RAN-INFORMATION RIM Container */ static guint16 -de_bssgp_ran_inf_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_inf_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; @@ -3792,7 +3792,7 @@ de_bssgp_ran_inf_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U * 11.3.62a.3 RAN-INFORMATION-ACK RIM Container */ static guint16 -de_bssgp_ran_inf_ack_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_inf_ack_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; @@ -3819,7 +3819,7 @@ de_bssgp_ran_inf_ack_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf * 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container */ static guint16 -de_bssgp_ran_inf_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_inf_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; @@ -3848,7 +3848,7 @@ de_bssgp_ran_inf_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi * 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container */ static guint16 -de_bssgp_ran_inf_app_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_ran_inf_app_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; @@ -3880,7 +3880,7 @@ de_bssgp_ran_inf_app_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info * 11.3.79 Source BSS to Target BSS Transparent Container */ guint16 -de_bssgp_source_BSS_to_target_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_source_BSS_to_target_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; @@ -3917,7 +3917,7 @@ de_bssgp_source_BSS_to_target_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, p * 11.3.80 Target BSS to Source BSS Transparent Container */ guint16 -de_bssgp_target_BSS_to_source_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_target_BSS_to_source_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 consumed; diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index e6da159800..9b10798669 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -2060,7 +2060,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_link_policy_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint16 cmd_ocf, bluetooth_data_t *bluetooth_data) +dissect_link_policy_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint16 cmd_ocf, bluetooth_data_t *bluetooth_data) { proto_item *item; guint16 timeout; @@ -2794,7 +2794,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin } static int -dissect_informational_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_informational_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint16 cmd_ocf) { switch (cmd_ocf) { @@ -2824,7 +2824,7 @@ dissect_informational_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pin } static int -dissect_status_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_status_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint16 cmd_ocf) { switch (cmd_ocf) { @@ -2888,7 +2888,7 @@ dissect_status_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -dissect_testing_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint16 cmd_ocf) +dissect_testing_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint16 cmd_ocf) { switch (cmd_ocf) { diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 0e0c04ce23..a944e6a2ab 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -64,7 +64,7 @@ void proto_reg_handoff_bthci_sco(void); /* Code to actually dissect the packets */ static gint -dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) +dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *ti; proto_tree *bthci_sco_tree; diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 3810e86a3d..fcf2a1f652 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -911,7 +911,7 @@ dissect_bac_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static gint dissect_bind_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, gint role, guint16 type, guint8 *parameter_stream, - guint parameter_number _U_, gint parameter_length, void **data _U_) + guint parameter_number, gint parameter_length, void **data _U_) { guint32 value; @@ -933,7 +933,7 @@ dissect_bind_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, static gint dissect_biev_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, gint role, guint16 type, guint8 *parameter_stream, - guint parameter_number _U_, gint parameter_length, void **data _U_) + guint parameter_number, gint parameter_length, void **data _U_) { proto_item *pitem; guint32 value; @@ -1088,8 +1088,8 @@ dissect_cind_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } static gint -dissect_chld_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, - gint offset, gint role, guint16 type, guint8 *parameter_stream _U_, +dissect_chld_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, + gint offset, gint role, guint16 type, guint8 *parameter_stream, guint parameter_number, gint parameter_length, void **data _U_) { guint32 value; @@ -1124,8 +1124,8 @@ dissect_chld_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } static gint -dissect_ccwa_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, - gint offset, gint role, guint16 type, guint8 *parameter_stream _U_, +dissect_ccwa_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, + gint offset, gint role, guint16 type, guint8 *parameter_stream, guint parameter_number, gint parameter_length, void **data _U_) { proto_item *pitem; diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index e38549cd31..565d800c20 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1544,7 +1544,7 @@ static const value_string fortinet_element_id_vals[] = { static int -dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *sub_msg_element_type_tree, guint offset, packet_info *pinfo _U_, guint optlen, proto_item *msg_element_type_item) +dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *sub_msg_element_type_tree, guint offset, packet_info *pinfo, guint optlen, proto_item *msg_element_type_item) { guint element_id, i; @@ -2054,7 +2054,7 @@ static const value_string cisco_ap_mode_and_type_mode_vals[] = { static int -dissect_capwap_message_element_vendor_cisco_type(tvbuff_t *tvb, proto_tree *sub_msg_element_type_tree, guint offset, packet_info *pinfo _U_, guint optlen, proto_item *msg_element_type_item) +dissect_capwap_message_element_vendor_cisco_type(tvbuff_t *tvb, proto_tree *sub_msg_element_type_tree, guint offset, packet_info *pinfo, guint optlen, proto_item *msg_element_type_item) { guint element_id; diff --git a/epan/dissectors/packet-cattp.c b/epan/dissectors/packet-cattp.c index d10f9d08cf..277a1e1376 100644 --- a/epan/dissectors/packet-cattp.c +++ b/epan/dissectors/packet-cattp.c @@ -337,7 +337,7 @@ dissect_cattp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U /* The heuristic dissector function checks if the UDP packet may be a cattp packet */ static gboolean -dissect_cattp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_cattp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if (tvb_captured_length(tvb) >= CATTP_HBLEN) { /* check of data is big enough for base header. */ guint8 flags, hlen; diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index bea70ad0dd..6f1b1298ae 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -2288,7 +2288,7 @@ typedef struct _c_encoded { static guint c_dissect_encoded(proto_tree *tree, c_encoded *enc, guint8 minver, guint8 maxver, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; @@ -2353,7 +2353,7 @@ guint c_dissect_eversion(proto_tree *root, gint hf, /** Dissect an object locator. */ static guint c_dissect_object_locator(proto_tree *root, gint hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -2415,7 +2415,7 @@ guint c_dissect_object_locator(proto_tree *root, gint hf, /** Dissect a placement group. */ static guint c_dissect_pg(proto_tree *root, gint hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree; @@ -2455,7 +2455,7 @@ guint c_dissect_pg(proto_tree *root, gint hf, /** Dissect a placement group creation. */ static guint c_dissect_pg_create(proto_tree *root, gint hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -2488,7 +2488,7 @@ guint c_dissect_pg_create(proto_tree *root, gint hf, /** Dissect a filepath. */ static guint c_dissect_path(proto_tree *root, gint hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree; @@ -2579,7 +2579,7 @@ guint c_dissect_mds_release(proto_tree *root, gint hf, /** Dissect a HitSet::Params */ static guint c_dissect_hitset_params(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree; @@ -2638,7 +2638,7 @@ guint c_dissect_hitset_params(proto_tree *root, /** Dissect a pool_snap_info_t */ static guint c_dissect_snapinfo(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -2681,7 +2681,7 @@ guint c_dissect_snapinfo(proto_tree *root, /** Dissect a pg pool. */ static guint c_dissect_pgpool(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree, *subtree; @@ -2908,7 +2908,7 @@ guint c_dissect_pgpool(proto_tree *root, /** Dissect a MonMap. */ static guint c_dissect_monmap(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree, *subtree; @@ -2974,7 +2974,7 @@ guint c_dissect_monmap(proto_tree *root, /** Dissect an osd_peer_stat_t */ static guint c_dissect_osd_peerstat(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -3050,7 +3050,7 @@ guint c_dissect_featureset(proto_tree *root, int hf, /** Dissect a CompatSet */ static guint c_dissect_compatset(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -3071,7 +3071,7 @@ guint c_dissect_compatset(proto_tree *root, /** Dissect an OSDSuperblock */ static guint c_dissect_osd_superblock(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -3152,7 +3152,7 @@ guint c_dissect_osd_superblock(proto_tree *root, /** Dissect an osd_info_t. */ static guint c_dissect_osdinfo(proto_tree *root, int hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree; @@ -3199,7 +3199,7 @@ guint c_dissect_osdinfo(proto_tree *root, int hf, /** Dissect an osd_xinfo_t. */ static guint c_dissect_osd_xinfo(proto_tree *root, int hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -3245,7 +3245,7 @@ guint c_dissect_osd_xinfo(proto_tree *root, int hf, /** Dissect an objectstore_perfstat_t. */ static guint c_dissect_perfstat(proto_tree *root, int hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -3276,7 +3276,7 @@ guint c_dissect_perfstat(proto_tree *root, int hf, /** Dissect an osd_stat_t. */ static guint c_dissect_osd_stat(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -3364,7 +3364,7 @@ guint c_dissect_crush(proto_tree *root, /** Dissect an OSDMap. */ static guint c_dissect_osdmap(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree, *subtree; @@ -3699,7 +3699,7 @@ guint c_dissect_osdmap(proto_tree *root, /** Dissect an incremental OSDMap. */ static guint c_dissect_osdmap_inc(proto_tree *root, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree, *subtree; @@ -3765,7 +3765,7 @@ typedef struct _c_osd_op { /** Dissect OSD Operation. */ static guint c_dissect_osd_op(proto_tree *root, gint hf, c_osd_op *out, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti, *ti2; proto_tree *tree; @@ -3908,7 +3908,7 @@ guint c_dissect_osd_op(proto_tree *root, gint hf, c_osd_op *out, /** Dissect a redirect. */ static guint c_dissect_redirect(proto_tree *root, gint hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -4073,7 +4073,7 @@ guint c_dissect_statcollection(proto_tree *root, int key, /** Dissect an pg_stat_t. */ static guint c_dissect_pg_stats(proto_tree *root, int hf, - tvbuff_t *tvb, guint off, c_pkt_data *data _U_) + tvbuff_t *tvb, guint off, c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -4323,10 +4323,10 @@ guint c_dissect_msg_ping(proto_tree *root _U_, /** Dissect monmap message 0x0004 */ static -guint c_dissect_msg_mon_map(proto_tree *root _U_, - tvbuff_t *tvb _U_, +guint c_dissect_msg_mon_map(proto_tree *root, + tvbuff_t *tvb, guint front_len, guint middle_len _U_, guint data_len _U_, - c_pkt_data *data _U_) + c_pkt_data *data) { proto_item *ti; proto_tree *tree; @@ -7053,7 +7053,7 @@ int dissect_ceph(tvbuff_t *tvb, packet_info *pinfo, * Proxies the old style dissector interface to the new style. */ static -int dissect_ceph_old(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) +int dissect_ceph_old(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { dissect_ceph(tvb, pinfo, tree, data); return tvb_captured_length(tvb); @@ -7061,7 +7061,7 @@ int dissect_ceph_old(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* static gboolean dissect_ceph_heur(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, void *data _U_) + proto_tree *tree, void *data) { conversation_t *conv; diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index ebc24d53f3..be543d87b6 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -112,7 +112,7 @@ const value_string chdlc_vals[] = { }; gboolean -capture_chdlc( const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_ ) { +capture_chdlc( const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header) { if (!BYTES_ARE_IN_FRAME(offset, len, 4)) return FALSE; diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 136e72808a..e7cb3244ea 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -842,7 +842,7 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ * a CIMD MSU here. */ static gboolean -dissect_cimd_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_cimd_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { int etxp; guint8 opcode = 0; /* Operation code */ diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 5244be1bd6..69fa4d3655 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -2730,8 +2730,8 @@ static int dissect_id_status(packet_info *pinfo, proto_tree *tree, proto_item *i return 2; } -static int dissect_msg_rout_num_classes(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, - int offset, int total_len _U_) +static int dissect_msg_rout_num_classes(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, + int offset, int total_len) { guint16 i, num_classes; diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index ba62687995..9ff8668579 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -433,7 +433,7 @@ static const value_string cip_svalidator_type_conn_type_vals[] = { }; void -dissect_unid(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_item *pi, +dissect_unid(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_item *pi, const char* ssn_name, int hf_ssn_timestamp, int hf_ssn_date, int hf_ssn_time, int hf_macid, gint ett, gint ett_ssn) { diff --git a/epan/dissectors/packet-coseventcomm.c b/epan/dissectors/packet-coseventcomm.c index 92224d2580..b5b53fd5d5 100644 --- a/epan/dissectors/packet-coseventcomm.c +++ b/epan/dissectors/packet-coseventcomm.c @@ -102,7 +102,7 @@ decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *ptr * IDL:omg.org/CosEventComm/PushConsumer/push:1.0 */ static void -decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item, int *offset, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian) { switch(header->message_type) { case Request: @@ -135,7 +135,7 @@ decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info *pinfo _U_, * IDL:omg.org/CosEventComm/PushConsumer/disconnect_push_consumer:1.0 */ static void -decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { switch(header->message_type) { case Request: @@ -166,7 +166,7 @@ decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb _U_, pac * IDL:omg.org/CosEventComm/PushSupplier/disconnect_push_supplier:1.0 */ static void -decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { switch(header->message_type) { case Request: @@ -197,7 +197,7 @@ decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb _U_, pac * IDL:omg.org/CosEventComm/PullSupplier/pull:1.0 */ static void -decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item, int *offset, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian) { switch(header->message_type) { case Request: @@ -228,7 +228,7 @@ decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, * IDL:omg.org/CosEventComm/PullSupplier/try_pull:1.0 */ static void -decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item, int *offset, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian) { switch(header->message_type) { case Request: @@ -261,7 +261,7 @@ decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_info *pinfo * IDL:omg.org/CosEventComm/PullSupplier/disconnect_pull_supplier:1.0 */ static void -decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { switch(header->message_type) { case Request: @@ -292,7 +292,7 @@ decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb _U_, pac * IDL:omg.org/CosEventComm/PullConsumer/disconnect_pull_consumer:1.0 */ static void -decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, int *offset _U_, MessageHeader *header, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { switch(header->message_type) { case Request: @@ -364,8 +364,8 @@ process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, M static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, const gchar *operation, gchar *idlname) { - proto_item *item _U_; - proto_tree *tree _U_; + proto_item *item; + proto_tree *tree; gboolean stream_is_big_endian = is_big_endian(header); /* get endianess */ /* If we have a USER Exception, then decode it and return */ diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 03bf67239c..f13efabda6 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -570,7 +570,7 @@ dissect_ctdb_reply_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto } static int -dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 reqid, guint32 dst, int endianess) +dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 reqid, guint32 dst, int endianess) { guint32 datalen, keylen; wmem_tree_key_t tkey[3]; @@ -627,7 +627,7 @@ dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr } static int -dissect_ctdb_req_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 reqid, int endianess) +dissect_ctdb_req_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 reqid, int endianess) { guint32 keylen, datalen, dmaster; wmem_tree_key_t tkey[3]; @@ -694,7 +694,7 @@ dissect_ctdb_req_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot static int -dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 reqid, guint32 src, guint32 dst, int endianess) +dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 reqid, guint32 src, guint32 dst, int endianess) { guint32 datalen; guint32 opcode; @@ -787,7 +787,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot } static int -dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 reqid, guint32 src, guint32 dst, int endianess) +dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 reqid, guint32 src, guint32 dst, int endianess) { ctdb_control_t *ctdb_control; wmem_tree_key_t tkey[4]; diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index e424698bee..9c84336ecb 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -59,7 +59,7 @@ static gboolean generate_md5_hash = FALSE; static gint ett_data = -1; static int -dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* data _U_) +dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { gint bytes; diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 4075dc827c..0ff2021087 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -397,7 +397,7 @@ dissect_feature_options(proto_tree *dccp_options_tree, tvbuff_t *tvb, * This function dissects DCCP options */ static void -dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, +dissect_options(tvbuff_t *tvb, packet_info *pinfo, proto_tree *dccp_options_tree, proto_tree *tree _U_, e_dccphdr *dccph _U_, int offset_start, diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index 4938dfd764..502274d6a5 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -330,7 +330,7 @@ dissect_browser_browserr_debug_call_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_debug_call_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_rc, NULL); @@ -364,7 +364,7 @@ dissect_browser_browserr_query_other_domains_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_other_domains_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_unknown_long, NULL); @@ -395,7 +395,7 @@ dissect_browser_browserr_reset_netlogon_state_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_reset_netlogon_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_rc, NULL); @@ -428,7 +428,7 @@ dissect_browser_browserr_debug_trace_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_debug_trace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_rc, NULL); @@ -583,7 +583,7 @@ dissect_browser_browserr_reset_statistics_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_reset_statistics_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_rc, NULL); @@ -611,7 +611,7 @@ dissect_browser_netr_browser_statistics_clear_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_netr_browser_statistics_clear_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_rc, NULL); @@ -643,7 +643,7 @@ dissect_browser_netr_browser_statistics_clear_reply(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_11(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, di, drep, hf_browser_unknown_hyper, NULL); @@ -908,7 +908,7 @@ dissect_browser_browserr_set_netlogon_state_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_set_netlogon_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_browser_rc, NULL); diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index bc90418cce..efa83ae0ae 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -594,7 +594,7 @@ epm_dissect_ept_insert_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_insert_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { /* [out] error_status_t *status */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, @@ -624,7 +624,7 @@ epm_dissect_ept_delete_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_delete_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di _U_, guint8 *drep) + dcerpc_info *di, guint8 *drep) { /* [out] error_status_t *status */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,