diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 04:13:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 17:40:33 +0200 |
| commit | 82ee6ee5035a6265aa97da0befd8d65358c89c9d (patch) | |
| tree | c0083c49fa286ae9ab1f5d6e51f581cb721aa686 /source4 | |
| parent | 33d05a739111bfa1f971544841026067df6662c3 (diff) | |
| download | samba-82ee6ee5035a6265aa97da0befd8d65358c89c9d.tar.gz samba-82ee6ee5035a6265aa97da0befd8d65358c89c9d.tar.bz2 samba-82ee6ee5035a6265aa97da0befd8d65358c89c9d.zip | |
Improve formatting in pidl code, make sure OBJREF member gets created.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 7 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index a34e7ef7ba..5eb5cbc195 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -1081,8 +1081,9 @@ sub ValidUnion($) ValidProperties($union,"UNION"); - if (has_property($union->{PARENT}, "nodiscriminant") and has_property($union->{PARENT}, "switch_type")) { - fatal($union->{PARENT}, $union->{PARENT}->{NAME} . ": switch_type() on union without discriminant"); + if (has_property($union->{PARENT}, "nodiscriminant") and + has_property($union->{PARENT}, "switch_type")) { + fatal($union->{PARENT}, $union->{PARENT}->{NAME} . ": switch_type(" . $union->{PARENT}->{PROPERTIES}->{switch_type} . ") on union without discriminant"); } return unless defined($union->{ELEMENTS}); @@ -1101,7 +1102,7 @@ sub ValidUnion($) } if (has_property($e, "ref")) { - fatal($e, el_name($e) . " : embedded ref pointers are not supported yet\n"); + fatal($e, el_name($e) . ": embedded ref pointers are not supported yet\n"); } diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm index 855798b70b..996689b4b6 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm @@ -88,6 +88,7 @@ sub ParseInterface($) $res .="struct $if->{NAME}_vtable;\n\n"; $res .="struct $if->{NAME} { + struct OBJREF obj; struct com_context *ctx; struct $if->{NAME}_vtable *vtable; void *object_data; |