r15260: Don't dereference NULL pointers to obtain array lengths - found by

[samba.git] / source / pidl / lib / Parse / Pidl / Compat.pm

diff --git a/source/pidl/lib/Parse/Pidl/Compat.pm b/source/pidl/lib/Parse/Pidl/Compat.pm
index 39cb67fd71772bf5e1cd837d372ec3e391667d75..944193ac1b980e7c06f524830a32ae4a72363bcd 100644 (file)
--- a/source/pidl/lib/Parse/Pidl/Compat.pm
+++ b/source/pidl/lib/Parse/Pidl/Compat.pm
@@ -8,6 +8,9 @@ package Parse::Pidl::Compat;
 use Parse::Pidl::Util qw(has_property);
 use strict;
 
+use vars qw($VERSION);
+$VERSION = '0.01';
+
 my %supported_properties = (
        # interface
        "helpstring"            => ["INTERFACE", "FUNCTION"],
@@ -71,29 +74,19 @@ my %supported_properties = (
        "length_is"             => ["ELEMENT"],
 );
 
-
-my($res);
-
 sub warning($$)
-{
-       my $l = shift;
-       my $m = shift;
-
-       print "$l->{FILE}:$l->{LINE}:Warning:$m\n";
-}
-
-sub error($$)
 {
        my ($l,$m) = @_;
-       print "$l->{FILE}:$l->{LINE}:$m\n";
+
+       print STDERR "$l->{FILE}:$l->{LINE}:warning:$m\n";
 }
 
 sub CheckTypedef($)
 {
-       my $td = shift;
+       my ($td) = @_;
 
        if (has_property($td, "nodiscriminant")) {
-               error($td, "nodiscriminant property not supported");
+               warning($td, "nodiscriminant property not supported");
        }
 
        if ($td->{TYPE} eq "BITMAP") {
@@ -118,7 +111,7 @@ sub CheckElement($)
        my $e = shift;
 
        if (has_property($e, "noheader")) {
-               error($e, "noheader property not supported");
+               warning($e, "noheader property not supported");
                return;
        }
 
@@ -128,30 +121,24 @@ sub CheckElement($)
        }
 
        if (has_property($e, "compression")) {
-               error($e, "compression() property not supported");
-       }
-
-       if (has_property($e, "obfuscation")) {
-               error($e, "obfuscation() property not supported");
+               warning($e, "compression() property not supported");
        }
 
        if (has_property($e, "sptr")) {
-               error($e, "sptr() pointer property not supported");
+               warning($e, "sptr() pointer property not supported");
        }
 
        if (has_property($e, "relative")) {
-               error($e, "relative() pointer property not supported");
+               warning($e, "relative() pointer property not supported");
        }
 
-       if (has_property($td, "flag")) {
+       if (has_property($e, "flag")) {
                warning($e, "ignoring flag() property");
        }
        
-       if (has_property($td, "value")) {
+       if (has_property($e, "value")) {
                warning($e, "ignoring value() property");
        }
-
-       StripProperties($e);
 }
 
 sub CheckFunction($)
@@ -159,12 +146,8 @@ sub CheckFunction($)
        my $fn = shift;
 
        if (has_property($fn, "noopnum")) {
-               error($fn, "noopnum not converted. Opcodes will be out of sync.");
+               warning($fn, "noopnum not converted. Opcodes will be out of sync.");
        }
-
-       StripProperties($fn);
-
-
 }
 
 sub CheckInterface($)
@@ -173,11 +156,9 @@ sub CheckInterface($)
 
        if (has_property($if, "pointer_default_top") and 
                $if->{PROPERTIES}->{pointer_default_top} ne "ref") {
-               error($if, "pointer_default_top() is pidl-specific");
+               warning($if, "pointer_default_top() is pidl-specific");
        }
 
-       StripProperties($if);
-
        foreach my $x (@{$if->{DATA}}) {
                if ($x->{TYPE} eq "DECLARE") {
                        warning($if, "the declare keyword is pidl-specific");
@@ -190,14 +171,10 @@ sub Check($)
 {
        my $pidl = shift;
        my $nidl = [];
-       my $res = "";
 
-       foreach my $x (@{$pidl}) {
-               push (@$nidl, CheckInterface($x)) 
-                       if ($x->{TYPE} eq "INTERFACE");
+       foreach (@{$pidl}) {
+               push (@$nidl, CheckInterface($_)) if ($_->{TYPE} eq "INTERFACE");
        }
-
-       return $res;
 }
 
 1;