osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Alexis La Goutte 2011-11-18 10:30:46 +00:00
parent 680b3d3a86
commit f207b03503
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/wireshark_gen.py
View File

@ -2102,8 +2102,6 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) {
# include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <gmodule.h>
#include <string.h>
@ -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