diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 19:50:43 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 19:50:43 +0000 |
| commit | 8d3dd59976ca5a8851a57f28e8c7d6a0f22062e0 (patch) | |
| tree | 0083ccd6d10e85a85ef9e7138089163c7ddd5b56 /epan/dissectors/packet-lwapp.c | |
| parent | 9400890e86b26e71f7a382ddcc3f25e4366c2f3a (diff) | |
Remove check_col() guard
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30124 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-lwapp.c')
| -rw-r--r-- | epan/dissectors/packet-lwapp.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 035bd81b12..aa0db0ed90 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -271,10 +271,8 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo, /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, "CNTL "); - } /* Copy our header */ tvb_memcpy(tvb, (guint8*) &header, offset, sizeof(header)); @@ -333,9 +331,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo, /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3"); - } + col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3"); if (tree) { /* create display subtree for the protocol */ @@ -375,10 +371,8 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, "LWAPP IP or Layer 2"); - } /* First, set up our dest mac, if we're a control packet with a * dest of port 12223 */ |