diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-05-30 13:48:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:17 -0500 |
| commit | 022b973a2ae5af476e0e93296c07c16b395d926d (patch) | |
| tree | b4a95e9b53b9bc584ba70540688314618695ad42 | |
| parent | a0986dd424f2d50b2645f19f5b43512b517daca3 (diff) | |
| download | samba-022b973a2ae5af476e0e93296c07c16b395d926d.tar.gz samba-022b973a2ae5af476e0e93296c07c16b395d926d.tar.bz2 samba-022b973a2ae5af476e0e93296c07c16b395d926d.zip | |
r7109: Change noid() to noopnum() so it isn't confusing to people familiar with id()
(This used to be commit 7721fc727426ae9fcc26afa773f855aa232df637)
| -rw-r--r-- | source4/build/pidl/ndr.pm | 2 | ||||
| -rw-r--r-- | source4/build/pidl/validator.pm | 11 |
2 files changed, 2 insertions, 11 deletions
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}) { |