svn commit: samba r10788 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-10-06 20:53:55 +0000 (Thu, 06 Oct 2005)
New Revision: 10788

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10788

Log:
- Give unions a name
- Check initialisation function return value

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm	2005-10-06 20:07:53 UTC (rev 10787)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm	2005-10-06 20:53:55 UTC (rev 10788)
@@ -71,7 +71,8 @@
 	pidl "";
 	pidl "/* Marshall data and send request */";
 	pidl "";
-	pidl "init_$if->{NAME}_q_$fn->{NAME}(&q$inargs);";
+	pidl "if (!init_$if->{NAME}_q_$fn->{NAME}(&q$inargs))";
+	pidl "\treturn NT_STATUS_INVALID_PARAMETER;";
 	pidl "";
 	pidl "CLI_DO_RPC(cli, mem_ctx, PI_$uif, $ufn,";
 	pidl "\tq, r,";

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm	2005-10-06 20:07:53 UTC (rev 10787)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm	2005-10-06 20:53:55 UTC (rev 10788)
@@ -130,7 +130,7 @@
 	pidl "typedef struct $if->{NAME}_$n\_ctr {";
 	indent;
 	pidl "uint32 $_;" foreach (keys %$extra);
-	pidl "union {";
+	pidl "union $if->{NAME}_$n {";
 	indent;
 	foreach (@{$u->{ELEMENTS}}) {
 		next if ($_->{TYPE} eq "EMPTY");