svn commit: samba r8162 - in branches/SAMBA_4_0/source/build/pidl: .

abartlet at samba.org abartlet at samba.org
Tue Jul 5 10:06:16 GMT 2005


Author: abartlet
Date: 2005-07-05 10:06:15 +0000 (Tue, 05 Jul 2005)
New Revision: 8162

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

Log:
Revert my pad8 hack.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/build/pidl/ndr.pm
   branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
   branches/SAMBA_4_0/source/build/pidl/validator.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm	2005-07-05 10:05:40 UTC (rev 8161)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm	2005-07-05 10:06:15 UTC (rev 8162)
@@ -166,8 +166,7 @@
 			SUBCONTEXT_SIZE => $subsize,
 			IS_DEFERRED => $is_deferred,
 			COMPRESSION => util::has_property($e, "compression"),
-			OBFUSCATION => util::has_property($e, "obfuscation"),
-			PAD8 => util::has_property($e, "pad8")
+			OBFUSCATION => util::has_property($e, "obfuscation")
 		});
 	}
 

Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm	2005-07-05 10:05:40 UTC (rev 8161)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm	2005-07-05 10:06:15 UTC (rev 8162)
@@ -452,9 +452,6 @@
 
 	pidl "NDR_CHECK(ndr_push_subcontext_header(ndr, $l->{HEADER_SIZE}, $subcontext_size, $ndr));";
 	pidl "NDR_CHECK(ndr_push_bytes(ndr, $ndr->data, $ndr->offset));";
-	if (defined $l->{PAD8}) {
-	    pidl "NDR_CHECK(ndr_push_align(ndr, 8));";
-	}
 	deindent;
 	pidl "}";
 }
@@ -504,9 +501,6 @@
 		$advance = "$ndr->offset";
 	}
 	pidl "NDR_CHECK(ndr_pull_advance(ndr, $advance));";
-	if (defined $l->{PAD8}) {
-	    pidl "NDR_CHECK(ndr_pull_align(ndr, 8));";
-	}
 	deindent;
 	pidl "}";
 }

Modified: branches/SAMBA_4_0/source/build/pidl/validator.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/validator.pm	2005-07-05 10:05:40 UTC (rev 8161)
+++ branches/SAMBA_4_0/source/build/pidl/validator.pm	2005-07-05 10:06:15 UTC (rev 8162)
@@ -106,7 +106,6 @@
 	"default"		=> ["ELEMENT"],
 
 	# subcontext
-	"pad8"		        => ["ELEMENT"],
 	"subcontext"		=> ["ELEMENT"],
 	"subcontext_size"	=> ["ELEMENT"],
 	"compression"		=> ["ELEMENT"],



More information about the samba-cvs mailing list