From cfa230c480b0c55a23e23dcb39e1b170da576c95 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 9 Jan 2007 06:02:41 +0000
Subject: r20625: Fix couple of warnings. (This used to be commit
 203076129b967ccc6258e807280dc1b75583a064)

---
 source4/pidl/tests/Util.pm | 12 ++++++++++--
 source4/pidl/tests/util.pl |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'source4/pidl/tests')

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);
-- 
cgit