Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check

[obnox/wireshark/wip.git] / epan / dissectors / packet-quake3.c

diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index 0ad6c78e63c6511e6bb6b76b365d3af87ea512a4..89c244196edbe6cea3b303d619775c20e2766bdf 100644 (file)
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -485,8 +485,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        direction = DIR_UNKNOWN;
 
-       if (check_col(pinfo->cinfo, COL_PROTOCOL))
-               col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE3");
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE3");
 
        if (tree) {
                quake3_item = proto_tree_add_item(tree, proto_quake3,
@@ -506,9 +505,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        }
 
        if (tvb_get_ntohl(tvb, 0) == 0xffffffff) {
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Connectionless ");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Connectionless ");
                if (quake3_tree)
                        proto_tree_add_uint_format(quake3_tree,
                                hf_quake3_connectionless,
@@ -518,9 +515,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        tvb, pinfo, quake3_tree, &direction);
        }
        else {
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Game ");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Game ");
                if (quake3_tree)
                        proto_tree_add_uint_format(quake3_tree,
                                hf_quake3_game,