diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-02-11 02:05:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:41 -0500 |
| commit | 0de6851e83d075e8c001255990b2018acc4a56c2 (patch) | |
| tree | 9f5ebc9512992d2da6fcc7b9b034cfb9472b4077 /source4/build/pidl/dump.pm | |
| parent | af7e9f2b5907a36d0d3c454d9ba9e49f98a11426 (diff) | |
| download | samba-0de6851e83d075e8c001255990b2018acc4a56c2.tar.gz samba-0de6851e83d075e8c001255990b2018acc4a56c2.tar.bz2 samba-0de6851e83d075e8c001255990b2018acc4a56c2.zip | |
r5320: Treat structs and unions somewhat more similarly:
- use same names in hashes (DATA -> ELEMENTS, etc)
- [case()] and [default] are no longer special case, they're just regular properties
(This used to be commit 6a0f599f822f5c42d93e78c13765804ab2223968)
Diffstat (limited to 'source4/build/pidl/dump.pm')
| -rw-r--r-- | source4/build/pidl/dump.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/pidl/dump.pm b/source4/build/pidl/dump.pm index 640bc3a120..00a57b10b4 100644 --- a/source4/build/pidl/dump.pm +++ b/source4/build/pidl/dump.pm @@ -98,11 +98,11 @@ sub DumpUnionElement($) my($element) = shift; my($res); - if ($element->{CASE} eq "default") { + if (util::has_property($element, "default")) { $res .= "[default] ;\n"; } else { - $res .= "[case($element->{CASE})] "; - $res .= DumpElement($element->{DATA}), if defined($element->{DATA}); + $res .= "[case($element->{PROPERTIES}->{case})] "; + $res .= DumpElement($element), if defined($element); $res .= ";\n"; } @@ -119,7 +119,7 @@ sub DumpUnion($) (defined $union->{PROPERTIES}) && ($res .= DumpProperties($union->{PROPERTIES})); $res .= "union {\n"; - foreach my $e (@{$union->{DATA}}) { + foreach my $e (@{$union->{ELEMENTS}}) { $res .= DumpUnionElement($e); } $res .= "}"; |