aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-kingfisher.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 06:26:46 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 06:26:46 +0000
commite971354a546be5efc284c72e49689a2e337bc198 (patch)
tree13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-kingfisher.c
parentfc067ab9104d12f3683c8f112250b8523260b77f (diff)
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'epan/dissectors/packet-kingfisher.c')
-rw-r--r--epan/dissectors/packet-kingfisher.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c
index d1c273ce14..bc0b7bec2e 100644
--- a/epan/dissectors/packet-kingfisher.c
+++ b/epan/dissectors/packet-kingfisher.c
@@ -207,8 +207,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
case 0x01:
case 0x80:
case 0x81:
- if(check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
if(check_col(pinfo->cinfo, COL_INFO)){
func_string = val_to_str(tvb_get_guint8(tvb, 0), function_code_vals, "Unknown function");
col_clear(pinfo->cinfo, COL_INFO);
@@ -278,8 +277,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
/* Ok this does look like Kingfisher, so lets dissect it */
func_string = val_to_str(kfp->function, function_code_vals, "Unknown function");
- if(check_col(pinfo->cinfo, COL_PROTOCOL) )
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
if(check_col(pinfo->cinfo, COL_INFO ))
{
col_clear(pinfo->cinfo, COL_INFO);