From 022b973a2ae5af476e0e93296c07c16b395d926d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 30 May 2005 13:48:35 +0000
Subject: r7109: Change noid() to noopnum() so it isn't confusing to people
 familiar with id() (This used to be commit
 7721fc727426ae9fcc26afa773f855aa232df637)

---
 source4/build/pidl/ndr.pm       |  2 +-
 source4/build/pidl/validator.pm | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm
index febf292c8a..09b2f0f257 100644
--- a/source4/build/pidl/ndr.pm
+++ b/source4/build/pidl/ndr.pm
@@ -452,7 +452,7 @@ sub ParseFunction($$$)
 		$ndr->{PROPERTIES}->{pointer_default_top}
 	);
 
-	if (not defined($d->{PROPERTIES}{noid})) {
+	if (not defined($d->{PROPERTIES}{noopnum})) {
 		$thisopnum = ${$opnum};
 		${$opnum}++;
 	}
diff --git a/source4/build/pidl/validator.pm b/source4/build/pidl/validator.pm
index 647a906878..50f7083b4b 100644
--- a/source4/build/pidl/validator.pm
+++ b/source4/build/pidl/validator.pm
@@ -62,8 +62,7 @@ my %property_list = (
 	"idempotent"		=> {},
 
 	# function
-	"id"			=> {},# what is that? --metze 
-	"noid"			=> {},
+	"noopnum"		=> {},
 	"in"			=> {},
 	"out"			=> {},
 
@@ -259,14 +258,6 @@ sub ValidFunction($)
 
 	ValidProperties($fn);
 
-	if (util::has_property($fn, "id")) {
-		nonfatal $fn, "[id()] is not correctly supported yet ($fn->{NAME})";
-	}
-
-	if (util::has_property($fn, "id") and util::has_property($fn, "noid")) {
-		fatal $fn, "function can't have [id()] and [noid] property ($fn->{NAME})";
-	}
-
 	foreach my $e (@{$fn->{ELEMENTS}}) {
 		$e->{PARENT} = $fn;
 		if (util::has_property($e, "ref") && !$e->{POINTERS}) {
-- 
cgit