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-smb-pipe.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-smb-pipe.c')
-rw-r--r-- | epan/dissectors/packet-smb-pipe.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 825e9b661a..9826475e6f 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -2651,9 +2651,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, } pinfo->current_proto = "LANMAN"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LANMAN"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LANMAN"); if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_smb_lanman, @@ -3539,9 +3537,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, /* * Set the columns. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Pipe"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Pipe"); if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, smb_info->request ? "Request" : "Response"); |