|
|
Author: jelmer
Date: 2007-02-21 10:55:03 +0000 (Wed, 21 Feb 2007)
New Revision: 21486
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21486
Log:
Remove spurious semicolons.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
- jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
metze@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
metze@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
jelmer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
2007-02-21 10:37:25 UTC (rev 21485)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
2007-02-21 10:55:03 UTC (rev 21486)
@@ -128,10 +128,10 @@
}
pidl "\n";
$tab_depth--;
- pidl "};\n";
+ pidl "}\n";
pidl "#else\n";
my $count = 0;
- pidl "enum $name { __donnot_use_enum_$name=0x7FFFFFFF};\n";
+ pidl "enum $name { __donnot_use_enum_$name=0x7FFFFFFF}\n";
my $with_val = 0;
my $without_val = 0;
foreach my $e (@{$enum->{ELEMENTS}}) {
@@ -154,7 +154,6 @@
pidl "#define $name ( $value )\n";
}
pidl "#endif\n";
- pidl "\n";
}
#####################################################################
@@ -357,7 +356,11 @@
HeaderUnion($d, $d->{NAME}) if ($d->{TYPE} eq "UNION");
HeaderEnum($d, $d->{NAME}) if ($d->{TYPE} eq "ENUM");
HeaderBitmap($d, $d->{NAME}) if ($d->{TYPE} eq "BITMAP");
- pidl ";\n\n";
+ pidl ";\n\n" if ($d->{TYPE} eq "BITMAP" or
+ $d->{TYPE} eq "STRUCT" or
+ $d->{TYPE} eq "TYPEDEF" or
+ $d->{TYPE} eq "UNION" or
+ $d->{TYPE} eq "ENUM");
}
foreach my $d (@{$interface->{DATA}}) {
|
|