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-pw-fr.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-pw-fr.c')
| -rw-r--r-- | epan/dissectors/packet-pw-fr.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 1952e2d51d..27acb0fe8c 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -93,15 +93,8 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) "PW packet (%d) is smaller than PW encapsulation header (%d)" ,(int)packet_size,(int)encaps_size); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); - } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, - "Malformed: PW packet < PW encapsulation header"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); + col_set_str(pinfo->cinfo, COL_INFO, "Malformed: PW packet < PW encapsulation header"); return; } @@ -171,10 +164,7 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) packet_quality |= PQ_PAYLOAD_SIZE_ZERO; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); |