From 128fe5324b803e0989273c7033ec0b5c8bd3dbae Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Nov 2006 13:48:01 +0000
Subject: r19856: Use sptr as basis for full ptr implementation. Will add
 checks for duplicates later. (This used to be commit
 006ab1d4a449c81680add57e0116a86b8317fbfb)

---
 source4/pidl/lib/Parse/Pidl/NDR.pm               | 15 +++------------
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |  6 +++---
 2 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'source4/pidl')

diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm
index 9048a25684..9670e05744 100644
--- a/source4/pidl/lib/Parse/Pidl/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/NDR.pm
@@ -309,7 +309,7 @@ sub pointer_type($)
 	return undef unless $e->{POINTERS};
 	
 	return "ref" if (has_property($e, "ref"));
-	return "ptr" if (has_property($e, "ptr"));
+	return "full" if (has_property($e, "ptr"));
 	return "sptr" if (has_property($e, "sptr"));
 	return "unique" if (has_property($e, "unique"));
 	return "relative" if (has_property($e, "relative"));
@@ -789,7 +789,6 @@ my %property_list = (
 	# pointer
 	"ref"			=> ["ELEMENT"],
 	"ptr"			=> ["ELEMENT"],
-	"sptr"			=> ["ELEMENT"],
 	"unique"		=> ["ELEMENT"],
 	"ignore"		=> ["ELEMENT"],
 	"relative"		=> ["ELEMENT"],
@@ -885,10 +884,6 @@ sub ValidElement($)
 
 	ValidProperties($e,"ELEMENT");
 
-	if (has_property($e, "ptr")) {
-		fatal($e, el_name($e) . " : pidl does not support full NDR pointers yet\n");
-	}
-
 	# Check whether switches are used correctly.
 	if (my $switch = has_property($e, "switch_is")) {
 		my $e2 = find_sibling($e, $switch);
@@ -946,7 +941,6 @@ sub ValidElement($)
 
 	if (!$e->{POINTERS} && (
 		has_property($e, "ptr") or
-		has_property($e, "sptr") or
 		has_property($e, "unique") or
 		has_property($e, "relative") or
 		has_property($e, "ref"))) {
@@ -1055,11 +1049,8 @@ sub ValidInterface($)
 	ValidProperties($interface,"INTERFACE");
 
 	if (has_property($interface, "pointer_default")) {
-		if ($interface->{PROPERTIES}->{pointer_default} eq "ptr") {
-			nonfatal $interface, "Full pointers are not supported yet, falling back to sptr";
-			$interface->{PROPERTIES}->{pointer_default} = "sptr";
-		} elsif (not grep (/$interface->{PROPERTIES}->{pointer_default}/, 
-					("ref", "unique", "ptr", "sptr"))) {
+		if (not grep (/$interface->{PROPERTIES}->{pointer_default}/, 
+					("ref", "unique", "ptr"))) {
 			fatal $interface, "Unknown default pointer type `$interface->{PROPERTIES}->{pointer_default}'";
 		}
 	}
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index d871ed38bb..f104ffbad8 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -669,8 +669,8 @@ sub ParsePtrPush($$$)
 		pidl "NDR_CHECK(ndr_push_relative_ptr1(ndr, $var_name));";
 	} elsif ($l->{POINTER_TYPE} eq "unique") {
 		pidl "NDR_CHECK(ndr_push_unique_ptr(ndr, $var_name));";
-	} elsif ($l->{POINTER_TYPE} eq "sptr") {
-		pidl "NDR_CHECK(ndr_push_sptr_ptr(ndr, $var_name));";
+	} elsif ($l->{POINTER_TYPE} eq "full") {
+		pidl "NDR_CHECK(ndr_push_full_ptr(ndr, $var_name));";
 	} else {
 		die("Unhandled pointer type $l->{POINTER_TYPE}");
 	}
@@ -1085,7 +1085,7 @@ sub ParsePtrPull($$$$)
 		return;
 	} elsif (($l->{POINTER_TYPE} eq "unique") or 
 		 ($l->{POINTER_TYPE} eq "relative") or
-		 ($l->{POINTER_TYPE} eq "sptr")) {
+		 ($l->{POINTER_TYPE} eq "full")) {
 		pidl "NDR_CHECK(ndr_pull_generic_ptr($ndr, &_ptr_$e->{NAME}));";
 		pidl "if (_ptr_$e->{NAME}) {";
 		indent;
-- 
cgit