diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-11-06 14:31:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:51 -0500 |
| commit | cca42c611a3f39b18395bcc40b097c65dd3469ae (patch) | |
| tree | 9770854c9a3baf35f29599f1fe5be8125e2b93eb /source4 | |
| parent | 4c57d08c5291edd773db503736b6ae35bd5b04cb (diff) | |
| download | samba-cca42c611a3f39b18395bcc40b097c65dd3469ae.tar.gz samba-cca42c611a3f39b18395bcc40b097c65dd3469ae.tar.bz2 samba-cca42c611a3f39b18395bcc40b097c65dd3469ae.zip | |
r11539: Fix indentation in templates. Always generate lower-case
UUID strings as GUID_from_string seems to have trouble with
uppercased ones.
(This used to be commit 16ea96c81ed88f197007335f442c9e62b4ccd6de)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/pidl/TODO | 2 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 2 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm | 2 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm | 2 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba/Template.pm | 10 |
5 files changed, 10 insertions, 8 deletions
diff --git a/source4/pidl/TODO b/source4/pidl/TODO index e7ff518e36..f1174024bf 100644 --- a/source4/pidl/TODO +++ b/source4/pidl/TODO @@ -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: diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index 8405873589..882ebeccb5 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -610,7 +610,7 @@ sub ParseInterface($) return { NAME => $idl->{NAME}, - UUID => has_property($idl, "uuid"), + UUID => lc(has_property($idl, "uuid")), VERSION => $version, TYPE => "INTERFACE", PROPERTIES => $idl->{PROPERTIES}, diff --git a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm index daf7ba0238..dd1848152e 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm @@ -99,7 +99,7 @@ sub HeaderInterface($) 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"; diff --git a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm index 99982e4ad1..1ee497e206 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm @@ -76,7 +76,7 @@ sub Boilerplate_Iface($) 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 " diff --git a/source4/pidl/lib/Parse/Pidl/Samba/Template.pm b/source4/pidl/lib/Parse/Pidl/Samba/Template.pm index 1960c89154..52bc2b2d3d 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba/Template.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba/Template.pm @@ -60,16 +60,16 @@ sub Template($) */ 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 .= "} "; } |