aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-lwapp.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 06:26:46 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 06:26:46 +0000
commitd9503878072210dc1b03da41b9c5ecaea8cb22f7 (patch)
tree13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-lwapp.c
parent761b3cce77c05a4c2073749490bd0d1aed1d6e5f (diff)
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-lwapp.c')
-rw-r--r--epan/dissectors/packet-lwapp.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index 43954daf24..0318b286ba 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -270,8 +270,7 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo,
gint offset=0;
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_INFO,
@@ -334,8 +333,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo,
tvbuff_t *next_client;
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
@@ -378,8 +376,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo,
gint offset=0;
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_INFO,