diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
| commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /plugins/sercosiii | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'plugins/sercosiii')
| -rw-r--r-- | plugins/sercosiii/packet-sercosiii_1v1.c | 3 | ||||
| -rw-r--r-- | plugins/sercosiii/packet-sercosiii_1v1_at.c | 3 | ||||
| -rw-r--r-- | plugins/sercosiii/packet-sercosiii_1v1_mdt.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/plugins/sercosiii/packet-sercosiii_1v1.c b/plugins/sercosiii/packet-sercosiii_1v1.c index 8c65ecf920..df2a9534f9 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1.c +++ b/plugins/sercosiii/packet-sercosiii_1v1.c @@ -56,8 +56,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint tel_no = 0; /* setup columns */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/plugins/sercosiii/packet-sercosiii_1v1_at.c b/plugins/sercosiii/packet-sercosiii_1v1_at.c index eaf28f76bb..81e284d098 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_at.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_at.c @@ -145,8 +145,7 @@ void dissect_siii_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) phase = (tvb_get_guint8(tvb, 1)&0x8F); /* read communication phase out of SERCOS III header*/ telno = (tvb_get_guint8(tvb, 0) & 0xF); /* read number of AT out of SERCOS III header */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII AT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII AT"); if(check_col(pinfo->cinfo, COL_INFO)) { diff --git a/plugins/sercosiii/packet-sercosiii_1v1_mdt.c b/plugins/sercosiii/packet-sercosiii_1v1_mdt.c index 4133df7660..0378aa51a4 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_mdt.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_mdt.c @@ -141,8 +141,7 @@ void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint t_phase; guint telno; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII MDT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII MDT"); t_phase = (tvb_get_guint8(tvb, 1)&0x8F); /* read communication phase out of SERCOS III header */ telno = (tvb_get_guint8(tvb, 0) & 0xF); /* read number of MDT out of SERCOS III header */ |