aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-goose.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-27 15:16:22 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-27 15:16:22 +0000
commit74477237139a93bed7dd587fc92e5b076421c957 (patch)
tree6752a850a8a865595092583444325995622ee91c /epan/dissectors/packet-goose.c
parent974368850771140d4b5b6156873d6be7405a6f84 (diff)
Use generated file from latest asn1 ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31699 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-goose.c')
-rw-r--r--epan/dissectors/packet-goose.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index 0c7d12b1af..4e0ceed2ab 100644
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -709,8 +709,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 */
@@ -993,7 +992,7 @@ void proto_register_goose(void) {
"goose.BIT_STRING", HFILL }},
/*--- End of included file: packet-goose-hfarr.c ---*/
-#line 137 "packet-goose-template.c"
+#line 136 "packet-goose-template.c"
};
/* List of subtrees */
@@ -1021,7 +1020,7 @@ void proto_register_goose(void) {
&ett_goose_Data,
/*--- End of included file: packet-goose-ettarr.c ---*/
-#line 143 "packet-goose-template.c"
+#line 142 "packet-goose-template.c"
};
/* Register protocol */