aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sua.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-09-26 17:50:54 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-09-26 17:50:54 +0000
commit14fbabcb26b922d35d153ec8af8162649db41275 (patch)
tree70baaec7f49a0bc7032c6754a088812f38d7f5a3 /epan/dissectors/packet-sua.c
parent75b86a9cd453c39889b27b3701135f64062f41f9 (diff)
Get rid of check_col() and use ENC.
svn path=/trunk/; revision=39153
Diffstat (limited to 'epan/dissectors/packet-sua.c')
-rw-r--r--epan/dissectors/packet-sua.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 81e012ef5d..4ca66b0392 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -520,8 +520,7 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre
message_class = tvb_get_guint8(common_header_tvb, MESSAGE_CLASS_OFFSET);
message_type = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_class * 256 + message_type, message_class_type_acro_values, "reserved"));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_class * 256 + message_type, message_class_type_acro_values, "reserved"));
if (sua_tree) {
/* add the components of the common header to the protocol tree */
@@ -2216,15 +2215,14 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *sua_tree;
/* make entry in the Protocol column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- switch (version) {
- case SUA_V08:
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA (ID 08)");
- break;
- case SUA_RFC:
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA (RFC 3868)");
- break;
- }
+
+ switch (version) {
+ case SUA_V08:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA (ID 08)");
+ break;
+ case SUA_RFC:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA (RFC 3868)");
+ break;
/* Clear entries in Info column on summary display */
col_clear(pinfo->cinfo, COL_INFO);