diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-04-23 11:39:40 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-04-23 15:47:33 +0000 |
| commit | be13690c3ce269f215040f8d91baf374d05100e8 (patch) | |
| tree | 7261b1b11fa22eb5e1af192d9d1c6aaf4ddd74a9 /tools | |
| parent | 1a1abf952373e4b6ce2ca6513e05c61904b563c9 (diff) | |
Continuation of bug 9532.
Ie4d1edfd67a8e6f02834573f29f07baf79058534 created a several duplicate hf_ registrations. That led to the exposure of some other potential problems with generating sequences.
Still not quite complete, but want to pacify the buildbots, so there is a small amount of manual editing to comment out a few duplicated hfs in packet-parlay.c.
Change-Id: I0ff8a9795e213ab966db8d6333b9477bad06250b
Reviewed-on: https://code.wireshark.org/review/1302
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/wireshark_gen.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 84b5d55f73..e3368f8c91 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -312,6 +312,7 @@ class wireshark_gen_C: if (rt.kind() == idltype.tk_alias): # a typdef return val possibly ? #self.get_CDR_alias(rt, rt.name() ) self.st.out(self.template_hf, name=sname + "_return") + self.st.out(self.template_hf, name=sname + "_return_loop") else: self.st.out(self.template_hf, name=sname + "_return") @@ -400,6 +401,9 @@ class wireshark_gen_C: for uc in un.cases(): # for all UnionCase objects in this union for cl in uc.labels(): # for all Caselabel objects in this UnionCase self.st.out(self.template_hf, name=sname + "_" + uc.declarator().identifier()) + if (uc.caseType().unalias().kind() == idltype.tk_sequence): + if (self.isSeqNativeType(uc.caseType().unalias().seqType())): + self.st.out(self.template_hf, name=sname + "_" + uc.declarator().identifier() + "_loop") # @@ -1077,6 +1081,16 @@ class wireshark_gen_C: return 1 elif pt == idltype.tk_boolean: return 1 + elif pt == idltype.tk_octet: + return 1 + elif pt == idltype.tk_enum: + return 1 + elif pt == idltype.tk_string: + return 1 + elif pt == idltype.tk_wstring: + return 1 + elif pt == idltype.tk_wchar: + return 1 elif pt == idltype.tk_char: return 1 else: |