r7109: Change noid() to noopnum() so it isn't confusing to people familiar with id()
authorJelmer Vernooij <jelmer@samba.org>
Mon, 30 May 2005 13:48:35 +0000 (13:48 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:17:17 +0000 (13:17 -0500)
source/build/pidl/ndr.pm
source/build/pidl/validator.pm

index febf292c8a3ec35716a7041059f23c5ab5967f47..09b2f0f2572bec5fa3b683c6e6f2bc21198f1f30 100644 (file)
@@ -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}++;
        }
index 647a9068784c05580be644f0f0fd1a20160c0a65..50f7083b4b2428bea4a2c22e9bc28f5d8fb15b84 100644 (file)
@@ -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}) {