diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:32:01 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:32:01 +0000 |
commit | 440c3f9261af41a397823a80121cfa0122df1c88 (patch) | |
tree | 64b368c46b53e0e8f52e80f61ed17e13d64596a5 /asn1 | |
parent | 6343ffb68e3e7ea3b335ad5e443e23f324a99d35 (diff) | |
download | wireshark-440c3f9261af41a397823a80121cfa0122df1c88.tar.gz |
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
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/goose/packet-goose-template.c | 3 | ||||
-rw-r--r-- | asn1/ulp/ulp.cnf | 6 |
2 files changed, 3 insertions, 6 deletions
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 */ diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index 72179ac12f..2375f9b381 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -28,10 +28,8 @@ SETId/min minsi #.FN_HDR ULP-PDU proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, FALSE); - if (check_col(actx->pinfo->cinfo, COL_PROTOCOL)) - col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, PSNAME); - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_clear(actx->pinfo->cinfo, COL_INFO); + col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, PSNAME); + col_clear(actx->pinfo->cinfo, COL_INFO); #.END #.FN_BODY UlpMessage VAL_PTR = &UlpMessage |