diff options
| -rwxr-xr-x | epan/dissectors/ncp2222.py | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ansi_801.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-cimd.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-dis-pdus.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 5 |
6 files changed, 21 insertions, 14 deletions
diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py index 423ac9e606..cb5896c96a 100755 --- a/epan/dissectors/ncp2222.py +++ b/epan/dissectors/ncp2222.py @@ -299,7 +299,7 @@ class PTVCBitfield(PTVC): def Code(self): ett_name = self.ETTName() - x = "static gint %s;\n" % (ett_name,) + x = "static gint %s = -1;\n" % (ett_name,) x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.Name()) for ptvc_rec in self.list: @@ -815,7 +815,7 @@ class struct(PTVC, Type): def Code(self): ett_name = self.ETTName() - x = "static gint %s;\n" % (ett_name,) + x = "static gint %s = -1;\n" % (ett_name,) x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.name,) for ptvc_rec in self.list: x = x + "\t%s,\n" % (ptvc_rec.Code()) diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index fd7df213d8..5477073406 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -2548,21 +2548,25 @@ proto_register_ansi_801(void) for (i=0; i < NUM_FOR_REQ_TYPE; i++, last_offset++) { + ett_for_req_type[i] = -1; ett[last_offset] = &ett_for_req_type[i]; } for (i=0; i < NUM_FOR_RSP_TYPE; i++, last_offset++) { + ett_for_rsp_type[i] = -1; ett[last_offset] = &ett_for_rsp_type[i]; } for (i=0; i < NUM_REV_REQ_TYPE; i++, last_offset++) { + ett_rev_req_type[i] = -1; ett[last_offset] = &ett_rev_req_type[i]; } for (i=0; i < NUM_REV_RSP_TYPE; i++, last_offset++) { + ett_rev_rsp_type[i] = -1; ett[last_offset] = &ett_rev_rsp_type[i]; } diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 4e2910bcc3..37aa89717e 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -849,10 +849,11 @@ proto_register_cimd(void) for(i=0;i<MAXPARAMSCOUNT;i++) { - ett[i + 1] = &(ett_index[i]); - vals_hdr_PC[i].ett_p = &(ett_index[i]); - vals_hdr_PC[i].hf_p = &(hf_index[i]); - vals_hdr_PC[i].diss = cimd_pc_handles[i]; + ett_index[i] = -1; + ett[i + 1] = &(ett_index[i]); + vals_hdr_PC[i].ett_p = &(ett_index[i]); + vals_hdr_PC[i].hf_p = &(hf_index[i]); + vals_hdr_PC[i].diss = cimd_pc_handles[i]; }; /* Register the protocol name and description */ diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index e6eaa0a7d7..3eb34fa508 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -487,7 +487,7 @@ dissect_spoolss_buffer(tvbuff_t *tvb, gint offset, packet_info *pinfo, * SYSTEM_TIME */ -static gint ett_SYSTEM_TIME; +static gint ett_SYSTEM_TIME = -1; static int hf_time_year = -1; static int hf_time_month = -1; @@ -1328,7 +1328,7 @@ static const value_string devmode_dithertype_vals[] = { 0, NULL } }; -static gint ett_DEVMODE_fields; +static gint ett_DEVMODE_fields = -1; static int dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo, @@ -4443,7 +4443,7 @@ static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, * JOB_INFO_1 */ -static gint ett_JOB_INFO_1; +static gint ett_JOB_INFO_1 = -1; static int dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, @@ -4515,7 +4515,7 @@ dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, * JOB_INFO_2 */ -static gint ett_JOB_INFO_2; +static gint ett_JOB_INFO_2 = -1; static int dissect_spoolss_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, @@ -6164,7 +6164,7 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } -static gint ett_NOTIFY_INFO_DATA; +static gint ett_NOTIFY_INFO_DATA = -1; static int dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, @@ -6732,7 +6732,7 @@ dissect_spoolss_printer_enum_values(tvbuff_t *tvb, int offset, return offset; } -static gint ett_PRINTER_DATA_CTR; +static gint ett_PRINTER_DATA_CTR = -1; static int SpoolssEnumPrinterDataEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, diff --git a/epan/dissectors/packet-dis-pdus.c b/epan/dissectors/packet-dis-pdus.c index 3856714b3b..4492ac95d8 100644 --- a/epan/dissectors/packet-dis-pdus.c +++ b/epan/dissectors/packet-dis-pdus.c @@ -148,6 +148,7 @@ DIS_ParserNode *createSubtree(DIS_ParserNode parserNodes[], gint *ettVar) initializeParser(newSubtree); + *ettVar = -1; ett[0] = ettVar; proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 50810cde66..55dc156621 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -5918,9 +5918,10 @@ proto_register_rsvp(void) }; /* Build the tree array */ - for (i=0; i<TT_MAX; i++) + for (i=0; i<TT_MAX; i++) { + ett_treelist[i] = -1; ett_tree[i] = &(ett_treelist[i]); - + } proto_rsvp = proto_register_protocol("Resource ReserVation Protocol (RSVP)", "RSVP", "rsvp"); proto_register_field_array(proto_rsvp, rsvpf_info, array_length(rsvpf_info)); |