aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cups.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-09-26 09:01:17 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-09-26 09:01:17 +0000
commitfc447d3377db6a9a8e2cc519087f8054e85c143c (patch)
treea281dce3d949029c1d21e15e10d5e61c9c5be2b5 /epan/dissectors/packet-cups.c
parent4b952c1324c2dd7ad9b5208550eb4e1c79aa2874 (diff)
Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39147
Diffstat (limited to 'epan/dissectors/packet-cups.c')
-rw-r--r--epan/dissectors/packet-cups.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 5a406ea61b..fa67a28c65 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -164,7 +164,7 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
ti = proto_tree_add_item(tree, proto_cups, tvb, offset, -1,
- FALSE);
+ ENC_BIG_ENDIAN);
cups_tree = proto_item_add_subtree(ti, ett_cups);
}
@@ -215,11 +215,10 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_text(cups_tree, tvb, offset, len,
"URI: %.*s",
(guint16) len, str);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "%.*s (%s)",
- (guint16) len, str,
- val_to_str(state, cups_state_values, "0x%x"));
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "%.*s (%s)",
+ (guint16) len, str,
+ val_to_str(state, cups_state_values, "0x%x"));
offset = next_offset;
if (!cups_tree)