From: Dirk Koopman <djk@tobit.co.uk>
Date: Thu, 9 Jul 2020 22:24:28 +0000 (+0100)
Subject: kill some 5.28 warnings
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=4d03e2c0f1feb9aa6011d6d72b0dd6e95b71da13;p=spider.git

kill some 5.28 warnings
---

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 12192891..c31e46f5 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -64,11 +64,11 @@ sub cread
 
 	dbg("DXCron::cread reading $fn\n") if isdbg('cron');
 	open($fh, $fn) or confess("cron: can't open $fn $!");
-	while (<$fh>) {
+	while (my $l = <$fh>) {
 		$line++;
-		chomp;
-		next if /^\s*#/o or /^\s*$/o;
-		my ($min, $hour, $mday, $month, $wday, $cmd) = /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
+		chomp $l;
+		next if $l =~ /^\s*#/o or $l =~ /^\s*$/o;
+		my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
 		next unless defined $min;
 		my $ref = bless {};
 		my $err = '';
@@ -82,18 +82,17 @@ sub cread
 			if (!$err) {
 				$ref->{cmd} = $cmd;
 				push @out, $ref;
-				dbg("DXCron::cread: adding $_\n") if isdbg('cron');
+				dbg("DXCron::cread: adding $l\n") if isdbg('cron');
 			} else {
 				$err =~ s/^, //;
-				LogDbg('cron', "DXCron::cread: error $err on line $line '$_'");
+				LogDbg('cron', "DXCron::cread: error $err on line $line '$l'");
 			}
 		} else {
-			LogDbg('cron', "DXCron::cread error on line $line '$_'");
+			LogDbg('cron', "DXCron::cread error on line $line '$l'");
 			my @s = ($min, $hour, $mday, $month, $wday, $cmd);
 			my $s = "line $line splits as " . join(', ', (map {defined $_ ? qq{$_} : q{'undef'}} @s));
 			LogDbg('cron', $s);
 		}
-		
 	}
 	close($fh);
 	return @out;
diff --git a/perl/Filter.pm b/perl/Filter.pm
index 867c8ddf..a422b014 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -372,7 +372,7 @@ sub parse
 	my $filter;
 	my ($flag, $call);
 	my $s;
-	my $user;
+	my $user = '';
 	
 	# check the line for non legal characters
 	dbg("Filter::parse line: '$line'") if isdbg('filter');
@@ -550,11 +550,13 @@ sub parse
 		}
 	}
 
-	# tidy up the user string
-	$user =~ s/\&\&/ and /g;
-	$user =~ s/\|\|/ or /g;
-	$user =~ s/\!/ not /g;
-	$user =~ s/\s+/ /g;
+	# tidy up the user string (why I have to stick in an if statement when I have initialised it I have no idea! 5.28 bug?
+	if ($user) {
+		$user =~ s/\&\&/ and /g;
+		$user =~ s/\|\|/ or /g;
+		$user =~ s/\!/ not /g;
+		$user =~ s/\s+/ /g;
+	}
 	
 	return (0, $filter, $fno, $user, $s);
 }