From 440c3f9261af41a397823a80121cfa0122df1c88 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Wed, 13 Jan 2010 20:32:01 +0000 Subject: From Didier Gautheron: check_col.diff Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394 svn path=/trunk/; revision=31519 --- asn1/goose/packet-goose-template.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'asn1/goose') diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c index 01996bf7d4..be64c65915 100644 --- a/asn1/goose/packet-goose-template.c +++ b/asn1/goose/packet-goose-template.c @@ -78,8 +78,7 @@ dissect_goose(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_goose, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_goose); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); + col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); col_clear(pinfo->cinfo, COL_INFO); /* APPID */ -- cgit v1.2.1