aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-image-jfif.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-06-14 01:02:11 +0000
committerMichael Mann <mmann78@netscape.net>2013-06-14 01:02:11 +0000
commit0f0c111119811cf1c6c9353efdaaef302aca5930 (patch)
tree1184b3876ae3b638c401313def0c8172b475b3f0 /epan/dissectors/packet-image-jfif.c
parentaf02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff)
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-image-jfif.c')
-rw-r--r--epan/dissectors/packet-image-jfif.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index 8a2e577987..1994e3befc 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -772,14 +772,11 @@ dissect_jfif(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
return 0;
/* Add summary to INFO column if it is enabled */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(JPEG JFIF image)");
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(JPEG JFIF image)");
- if (tree) {
- ti = proto_tree_add_item(tree, proto_jfif,
- tvb, 0, -1, ENC_NA);
- subtree = proto_item_add_subtree(ti, ett_jfif);
- }
+ ti = proto_tree_add_item(tree, proto_jfif,
+ tvb, 0, -1, ENC_NA);
+ subtree = proto_item_add_subtree(ti, ett_jfif);
for (; ; ) {
const char *str;