From f207b03503a7bf7b1b279fa4df2d5ffab72d2f7f Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Fri, 18 Nov 2011 10:30:46 +0000 Subject: Some modification in generated GIOP dissector plugins in not include in "generator" (wireshark_gen.py) * Remove some uneeded #includes (Revision 32419) * Don't guard col_set_str (COL_PROTOCOL) with col_check (Revision 29340) * Add missing #pragma warning disable, now using _MSC_VER (Revision 21222, 21227, 21240) svn path=/trunk/; revision=39931 --- tools/wireshark_gen.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/wireshark_gen.py') diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 4d76a4eaf6..0cb72218bc 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -2102,8 +2102,6 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) { # include "config.h" #endif -#include -#include #include #include @@ -2116,6 +2114,10 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) { G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif +#ifdef _MSC_VER +/* disable warning: "unreference local variable" */ +#pragma warning(disable:4101) +#endif """ @@ -2134,8 +2136,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, \"@disprot@\"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, \"@disprot@\"); /* * Do not clear COL_INFO, as nothing is being written there by -- cgit v1.2.3