svn commit: samba r11974 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR: .

[metze at samba.org]

Author: metze
Date: 2005-11-30 17:07:02 +0000 (Wed, 30 Nov 2005)
New Revision: 11974

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

Log:
only look at $pl->{POINTER_TYPE} when $pl is defined

metze
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm	2005-11-30 13:10:44 UTC (rev 11973)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm	2005-11-30 17:07:02 UTC (rev 11974)
@@ -2019,15 +2019,14 @@
 		pidl "if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {";
 		pidl "\tNDR_PULL_ALLOC_N($ndr, $var, $size);";
 		pidl "}";
-	} else {
-		pidl "NDR_PULL_ALLOC_N($ndr, $var, $size);";
+		if (grep(/in/,@{$e->{DIRECTION}}) and
+		    grep(/out/,@{$e->{DIRECTION}})) {
+			pidl "memcpy(r->out.$e->{NAME},r->in.$e->{NAME},$size * sizeof(*r->in.$e->{NAME}));";
+		}
+		return;
 	}
 
-	if (grep(/in/,@{$e->{DIRECTION}}) and
-	    grep(/out/,@{$e->{DIRECTION}}) and
-	    $pl->{POINTER_TYPE} eq "ref") {
-		pidl "memcpy(r->out.$e->{NAME},r->in.$e->{NAME},$size * sizeof(*r->in.$e->{NAME}));";
-	}
+	pidl "NDR_PULL_ALLOC_N($ndr, $var, $size);";
 }
 
 #####################################################################