diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:36:13 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:36:13 +0000 |
| commit | b2e9a22ec53becba2c23777ffee4ff375d135698 (patch) | |
| tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-vines.c | |
| parent | d629eac134867d997a496115fd1a04090f149fe7 (diff) | |
Don't guard col_clear with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-vines.c')
| -rw-r--r-- | epan/dissectors/packet-vines.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index bc33a21262..ef87d7ac1f 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -110,8 +110,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines FRP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_vines_frp, tvb, 0, 2, @@ -208,8 +207,7 @@ dissect_vines_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines LLC"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); ptype = tvb_get_guint8(tvb, 0); if (check_col(pinfo->cinfo, COL_INFO)) @@ -296,8 +294,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); /* To do: check for runts, errs, etc. */ @@ -441,8 +438,7 @@ dissect_vines_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines Echo"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_vines_echo, tvb, 0, -1, @@ -518,8 +514,7 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "VIPC"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); /* To do: check for runts, errs, etc. */ @@ -717,8 +712,7 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); /* To do: check for runts, errs, etc. */ @@ -865,8 +859,7 @@ dissect_vines_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 metric; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ARP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_vines_arp, tvb, 0, -1, @@ -1044,8 +1037,7 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 metric; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines RTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_vines_rtp, tvb, 0, -1, @@ -1550,8 +1542,7 @@ dissect_vines_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ICP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_vines_icp, tvb, 0, -1, |