diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-09 06:02:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:37:17 -0500 |
| commit | cfa230c480b0c55a23e23dcb39e1b170da576c95 (patch) | |
| tree | ff96974327bc4d771c6a07e11b1ff9f42ff6dbe3 /source4/pidl/tests | |
| parent | e0e96ae80d21c6b94e05fbf3af457001a005ce09 (diff) | |
| download | samba-cfa230c480b0c55a23e23dcb39e1b170da576c95.tar.gz samba-cfa230c480b0c55a23e23dcb39e1b170da576c95.tar.bz2 samba-cfa230c480b0c55a23e23dcb39e1b170da576c95.zip | |
r20625: Fix couple of warnings.
(This used to be commit 203076129b967ccc6258e807280dc1b75583a064)
Diffstat (limited to 'source4/pidl/tests')
| -rw-r--r-- | source4/pidl/tests/Util.pm | 12 | ||||
| -rwxr-xr-x | source4/pidl/tests/util.pl | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm index 2f43abe1ed..cfa1422674 100644 --- a/source4/pidl/tests/Util.pm +++ b/source4/pidl/tests/Util.pm @@ -18,14 +18,22 @@ my $warnings = ""; undef &Parse::Pidl::warning; *Parse::Pidl::warning = sub { my ($e, $l) = @_; - $warnings .= "$e->{FILE}:$e->{LINE}: $l\n"; + if (defined($e)) { + $warnings .= "$e->{FILE}:$e->{LINE}: $l\n"; + } else { + $warnings .= "$l\n"; + } }; my $errors = ""; undef &Parse::Pidl::error; *Parse::Pidl::error = sub { my ($e, $l) = @_; - $errors .= "$e->{FILE}:$e->{LINE}: $l\n"; + if (defined($e)) { + $errors .= "$e->{FILE}:$e->{LINE}: $l\n"; + } else { + $errors .= "$l\n"; + } }; use Test::More; diff --git a/source4/pidl/tests/util.pl b/source4/pidl/tests/util.pl index cea59af1b6..19cb90c080 100755 --- a/source4/pidl/tests/util.pl +++ b/source4/pidl/tests/util.pl @@ -2,6 +2,7 @@ # (C) 2007 Jelmer Vernooij <jelmer@samba.org> # Published under the GNU General Public License use strict; +use warnings; use Test::More tests => 56; use FindBin qw($RealBin); |