svn commit: samba r11539 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl lib/Parse/Pidl/Samba lib/Parse/Pidl/Samba/NDR

[jelmer at samba.org]

Author: jelmer
Date: 2005-11-06 14:31:01 +0000 (Sun, 06 Nov 2005)
New Revision: 11539

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

Log:
Fix indentation in templates. Always generate lower-case 
UUID strings as GUID_from_string seems to have trouble with 
uppercased ones.

Modified:
   branches/SAMBA_4_0/source/pidl/TODO
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/Template.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/TODO
===================================================================
--- branches/SAMBA_4_0/source/pidl/TODO	2005-11-06 14:17:00 UTC (rev 11538)
+++ branches/SAMBA_4_0/source/pidl/TODO	2005-11-06 14:31:01 UTC (rev 11539)
@@ -1,3 +1,5 @@
+- allow more then one identifier for types (unsigned char, struct foo)
+
 - true multiple dimension array / strings in arrays support
 
 - compatibility mode for generating MIDL-readable data:

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm	2005-11-06 14:17:00 UTC (rev 11538)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm	2005-11-06 14:31:01 UTC (rev 11539)
@@ -610,7 +610,7 @@
 
 	return { 
 		NAME => $idl->{NAME},
-		UUID => has_property($idl, "uuid"),
+		UUID => lc(has_property($idl, "uuid")),
 		VERSION => $version,
 		TYPE => "INTERFACE",
 		PROPERTIES => $idl->{PROPERTIES},

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm	2005-11-06 14:17:00 UTC (rev 11538)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm	2005-11-06 14:31:01 UTC (rev 11539)
@@ -99,7 +99,7 @@
 	if (defined $interface->{PROPERTIES}->{uuid}) {
 		my $name = uc $interface->{NAME};
 		pidl "#define DCERPC_$name\_UUID " . 
-		Parse::Pidl::Util::make_str($interface->{PROPERTIES}->{uuid}) . "\n";
+		Parse::Pidl::Util::make_str(lc($interface->{PROPERTIES}->{uuid})) . "\n";
 
 		if(!defined $interface->{PROPERTIES}->{version}) { $interface->{PROPERTIES}->{version} = "0.0"; }
 		pidl "#define DCERPC_$name\_VERSION $interface->{PROPERTIES}->{version}\n";

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm	2005-11-06 14:17:00 UTC (rev 11538)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm	2005-11-06 14:31:01 UTC (rev 11539)
@@ -76,7 +76,7 @@
 	my($interface) = shift;
 	my $name = $interface->{NAME}; 
 	my $uname = uc $name;
-	my $uuid = Parse::Pidl::Util::make_str($interface->{PROPERTIES}->{uuid});
+	my $uuid = Parse::Pidl::Util::make_str(lc($interface->{PROPERTIES}->{uuid}));
 	my $if_version = $interface->{PROPERTIES}->{version};
 
 	pidl "

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/Template.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/Template.pm	2005-11-06 14:17:00 UTC (rev 11538)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/Template.pm	2005-11-06 14:31:01 UTC (rev 11539)
@@ -60,16 +60,16 @@
 */
 static $d->{RETURN_TYPE} $fname(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct $fname *r)
-{";
+{
+";
 
 	if ($d->{RETURN_TYPE} eq "void") {
-		$res .= "DCESRV_FAULT_VOID(DCERPC_FAULT_OP_RNG_ERROR);\n";
+		$res .= "\tDCESRV_FAULT_VOID(DCERPC_FAULT_OP_RNG_ERROR);\n";
 	} else {
-		$res .= "DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);\n";
+		$res .= "\tDCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);\n";
 	}
 
-	$res .= "
-}
+	$res .= "}
 
 ";
 		}