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-osi.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-osi.c')
-rw-r--r-- | epan/dissectors/packet-osi.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index fbc7e29058..872d3dce6e 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -264,21 +264,15 @@ static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* ESIS (X.25) is not currently decoded */ case NLPID_ISO9542X25_ESIS: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS (X.25)"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS (X.25)"); call_dissector(data_handle,tvb, pinfo, tree); break; case NLPID_ISO10747_IDRP: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDRP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDRP"); call_dissector(data_handle,tvb, pinfo, tree); break; default: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISO"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISO"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ISO protocol (%02x)", nlpid); } |