diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-07-18 19:11:32 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-07-18 19:11:32 +0000 |
| commit | 3f7e7672c9feb345f2ee9c9a14e1151b88f598c9 (patch) | |
| tree | d357c244b5aec954d8451d8570d5f9a9d0ae95cb /epan/dissectors/packet-ptp.c | |
| parent | 7e6b1202c9f3d7d2504e7004eae6cb63047ffad6 (diff) | |
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38095
Diffstat (limited to 'epan/dissectors/packet-ptp.c')
| -rw-r--r-- | epan/dissectors/packet-ptp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index fdb2537909..208036ca42 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -2591,7 +2591,6 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } case PTP_V2_FOLLOWUP_MESSAGE:{ - guint16 tlv_type; guint16 tlv_length; proto_item *tlv_ti; proto_tree *ptp_tlv_tree; @@ -2610,7 +2609,6 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(ptp_v2_transport_specific & PTP_V2_TRANSPORTSPECIFIC_ASPACKET_BITMASK){ /* There are TLV's to be processed */ - tlv_type = tvb_get_ntohs (tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_TYPE_OFFSET); tlv_length = tvb_get_ntohs (tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_LENGTHFIELD_OFFSET); tlv_ti = proto_tree_add_text( @@ -2764,7 +2762,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } case PTP_V2_SIGNALLING_MESSAGE:{ - guint16 tlv_type, tlv_length; + guint16 tlv_length; proto_item *tlv_ti, *sig_tlv_flags_ti; proto_tree *ptp_tlv_tree, *sig_tlv_flags_tree; @@ -2778,7 +2776,6 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(ptp_v2_transport_specific & PTP_V2_TRANSPORTSPECIFIC_ASPACKET_BITMASK){ /* There are TLV's to be processed */ - tlv_type = tvb_get_ntohs (tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_TYPE_OFFSET); tlv_length = tvb_get_ntohs (tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_LENGTHFIELD_OFFSET); tlv_ti = proto_tree_add_text( @@ -2872,7 +2869,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_lengthField, tvb, PTP_V2_SIG_TARGETPORTID_OFFSET+4, 2, FALSE); - tlv_type = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_TYPE_OFFSET); + /*tlv_type = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_TYPE_OFFSET);*/ tlv_length = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_LENGTHFIELD_OFFSET); if (tlv_length <= 2) |