aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-hsr.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-11-14 20:04:04 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-11-14 20:04:04 +0000
commit58d897637ff8c68dc58075029abd01b2d5a82e50 (patch)
tree96320a582f3163c4df908c1332287af87e335515 /epan/dissectors/packet-hsr.c
parentc253df9aed31ea29a916e923a57feaaf8fbde654 (diff)
Remove uneeded #includes, forward refs & check_col();
tvb_reported_length_remaining() can return -1; Localize a variable. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39836 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-hsr.c')
-rw-r--r--epan/dissectors/packet-hsr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c
index 490cc2193f..ced36b443f 100644
--- a/epan/dissectors/packet-hsr.c
+++ b/epan/dissectors/packet-hsr.c
@@ -83,12 +83,9 @@ dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint16 etype;
guint16 lsdu_size, lsdu_size_correct;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSR");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSR");
- if (check_col(pinfo->cinfo, COL_INFO)){
- col_set_str(pinfo->cinfo, COL_INFO, "HSR-Data Frame");
- }
+ col_set_str(pinfo->cinfo, COL_INFO, "HSR-Data Frame");
/* create display subtree for the protocol */