From 82ee6ee5035a6265aa97da0befd8d65358c89c9d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 15 Sep 2008 04:13:12 +0200 Subject: Improve formatting in pidl code, make sure OBJREF member gets created. --- source4/pidl/lib/Parse/Pidl/NDR.pm | 7 ++++--- 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; -- cgit