From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 31 Jan 2011 13:05:52 +0000 (+0100)
Subject: pidl:Samba4/NDR/Parser: only do the switch type alignment when we have a switch type
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=6124148d66d90064ebe3fa2ecb2c6588705495a0;p=metze%2Fsamba%2Fwip.git

pidl:Samba4/NDR/Parser: only do the switch type alignment when we have a switch type

This doesn't change the logic, it just doesn't call the same aligment function
twice.

metze
---

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 5802f9b39309..7bc5a32d5e35 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1688,11 +1688,11 @@ sub ParseUnionPushPrimitives($$$$)
 
 	$self->pidl("uint32_t level = ndr_push_get_switch_value($ndr, $varname);");
 
-	if (defined($e->{ALIGN})) {
-		$self->pidl("NDR_CHECK(ndr_push_union_align($ndr, $e->{ALIGN}));");
-	}
-
 	if (defined($e->{SWITCH_TYPE})) {
+		if (defined($e->{ALIGN})) {
+			$self->pidl("NDR_CHECK(ndr_push_union_align($ndr, $e->{ALIGN}));");
+		}
+
 		$self->pidl("NDR_CHECK(ndr_push_$e->{SWITCH_TYPE}($ndr, NDR_SCALARS, level));");
 	}
 
@@ -1837,11 +1837,12 @@ sub ParseUnionPullPrimitives($$$$$)
 	my ($self,$e,$ndr,$varname,$switch_type) = @_;
 	my $have_default = 0;
 
-	if (defined($e->{ALIGN})) {
-		$self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));");
-	}
 
 	if (defined($switch_type)) {
+		if (defined($e->{ALIGN})) {
+			$self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));");
+		}
+
 		$self->pidl("NDR_CHECK(ndr_pull_$switch_type($ndr, NDR_SCALARS, &_level));");
 		$self->pidl("if (_level != level) {"); 
 		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value %u for $varname at \%s\", _level, __location__);");