diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
| commit | 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch) | |
| tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-dect.c | |
| parent | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff) | |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-dect.c')
| -rw-r--r-- | epan/dissectors/packet-dect.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 9488785e5c..391dc48d7d 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1864,10 +1864,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(pkt_len<13) { - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "No Data"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "No Data"); return; } @@ -1928,26 +1925,17 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(type) { case 0x1675: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT PP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT PP"); proto_item_append_text(typeti, " Phone Packet"); dissect_decttype(DECT_PACKET_PP, &pkt_afield, &pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree); break; case 0xe98a: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT RFP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT RFP"); proto_item_append_text(typeti, " Station Packet"); dissect_decttype(DECT_PACKET_FP, &pkt_afield, &pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree); break; default: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT Unk"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT Unk"); proto_item_append_text(typeti, " Unknown Packet"); break; } |