aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-msproxy.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 06:26:46 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 06:26:46 +0000
commitd9503878072210dc1b03da41b9c5ecaea8cb22f7 (patch)
tree13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-msproxy.c
parent761b3cce77c05a4c2073749490bd0d1aed1d6e5f (diff)
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-msproxy.c')
-rw-r--r--epan/dissectors/packet-msproxy.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index 9d8c386d84..aea729aa51 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -202,8 +202,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo,
redirect_info = conversation_get_proto_data(conversation,
proto_msproxy);
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS Proxy");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS Proxy");
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO,
@@ -1085,8 +1084,7 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
hash_entry_t *hash_info;
conversation_t *conversation;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSproxy");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSproxy");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);