[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-688-gc9c1156

Jelmer Vernooij jelmer at samba.org
Sat Feb 9 15:27:14 GMT 2008


The branch, v4-0-test has been updated
       via  c9c115647893478e21134f8c703e0f52e2478882 (commit)
       via  9a4b9facc869a8f7363932a591437251b44cd7bb (commit)
      from  5ade1a951685665164037138cb92e5b2db2a8b52 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit c9c115647893478e21134f8c703e0f52e2478882
Author: Julien Kerihuel <j.kerihuel at openchange.org>
Date:   Sat Feb 9 16:26:16 2008 +0100

    pidl: Allow fixed size arrays inside unions.

commit 9a4b9facc869a8f7363932a591437251b44cd7bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Feb 9 16:25:34 2008 +0100

    Fix test count after pointer_default_top() removal.

-----------------------------------------------------------------------

Summary of changes:
 source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |    4 ++--
 source/pidl/tests/ndr_compat.pl                 |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 6e6d227..60d5bf8 100644
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1611,7 +1611,7 @@ sub ParseUnionPushPrimitives($$$)
 		if ($el->{CASE} eq "default") {
 			$have_default = 1;
 		}
-		$self->pidl("$el->{CASE}:");
+		$self->pidl("$el->{CASE}: {");
 
 		if ($el->{TYPE} ne "EMPTY") {
 			$self->indent;
@@ -1625,7 +1625,7 @@ sub ParseUnionPushPrimitives($$$)
 			$self->ParseElementPush($el, "ndr", {$el->{NAME} => "$varname->$el->{NAME}"}, 1, 0);
 			$self->deindent;
 		}
-		$self->pidl("break;");
+		$self->pidl("break; }");
 		$self->pidl("");
 	}
 	if (! $have_default) {
diff --git a/source/pidl/tests/ndr_compat.pl b/source/pidl/tests/ndr_compat.pl
index 11b585c..355e7f6 100755
--- a/source/pidl/tests/ndr_compat.pl
+++ b/source/pidl/tests/ndr_compat.pl
@@ -3,7 +3,7 @@
 # Published under the GNU General Public License
 use strict;
 
-use Test::More tests => 3;
+use Test::More tests => 2;
 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util; 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list