From 063027ee2ff8df152a3d3a758916c0457fc18a89 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 17 Jul 2002 11:17:51 +0000
Subject: remove "$_ =~ " (as detected by new perl_checker)

---
 perl-install/commands.pm     |  2 +-
 perl-install/printer.pm      | 18 +++++++++---------
 perl-install/printerdrake.pm |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 36b0297e5..1c19a87db 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -346,7 +346,7 @@ sub hexdump {
     my $i = 0; $/ = \16; @ARGV = @_; while (<>) {
 	printf "%08lX  ", $i; $i += 16;
 	print join(" ", (map { sprintf "%02X", $_ } unpack("C*", $_)),
-		   ($_ =~ s/[^$printable_chars]/./og, $_)[1]), "\n";
+		   (s/[^$printable_chars]/./og, $_)[1]), "\n";
     }
 }
 
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index c6478a2ad..8d0357ab2 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -869,7 +869,7 @@ sub set_cups_autoconf {
     }
 
     # Remove all valid "CUPS_CONFIG" lines
-    ($_ =~ /^\s*CUPS_CONFIG/ and $_="") foreach @file_content;
+    (/^\s*CUPS_CONFIG/ and $_="") foreach @file_content;
  
     # Insert the new "Printcap" line
     if ($autoconf) {
@@ -2154,11 +2154,11 @@ sub addentry {
     local $_;
     for (@lines) {
 	if (!$sectionfound) {
-	    if ($_ =~ /^\s*\[\s*$section\s*\]\s*$/) {
+	    if (/^\s*\[\s*$section\s*\]\s*$/) {
 		$sectionfound = 1;
 	    }
 	} else {
-	    if (($_ !~ /^\s*$/) && ($_ !~ /^\s*;/)) {
+	    if (!/^\s*$/ && !/^\s*;/) {
 		$_ = "$entry\n$_";
 		$entryinserted = 1;
 		last;
@@ -2177,7 +2177,7 @@ sub addsection {
     my @lines = split("\n", $filecontent);
     local $_;
     for (@lines) {
-	if ($_ =~ /^\s*\[\s*$section\s*\]\s*$/) {
+	if (/^\s*\[\s*$section\s*\]\s*$/) {
 	    # section already there, nothing to be done
 	    return $filecontent;
 	}
@@ -2195,13 +2195,13 @@ sub removeentry {
 	$_ = "$_\n";
 	next if ($done);
 	if (!$sectionfound) {
-	    if ($_ =~ /^\s*\[\s*$section\s*\]\s*$/) {
+	    if (/^\s*\[\s*$section\s*\]\s*$/) {
 		$sectionfound = 1;
 	    }
 	} else {
-	    if ($_ =~ /^\s*\[.*\]\s*$/) { # Next section
+	    if (/^\s*\[.*\]\s*$/) { # Next section
 		$done = 1;
-	    } elsif ($_ =~ /^\s*$entry/) {
+	    } elsif (/^\s*$entry/) {
 		$_ = "";
 		$done = 1;
 	    }
@@ -2220,12 +2220,12 @@ sub removesection {
 	$_ = "$_\n";
 	next if ($done);
 	if (!$sectionfound) {
-	    if ($_ =~ /^\s*\[\s*$section\s*\]\s*$/) {
+	    if (/^\s*\[\s*$section\s*\]\s*$/) {
 		$_ = "";
 		$sectionfound = 1;
 	    }
 	} else {
-	    if ($_ =~ /^\s*\[.*\]\s*$/) { # Next section
+	    if (/^\s*\[.*\]\s*$/) { # Next section
 		$done = 1;
 	    } else {
 		$_ = "";
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index b14a75e25..9985e209e 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2390,7 +2390,7 @@ sub main {
 				$printer->{configured}{$printer->{DEFAULT}}{'queuedata'}{'menuentry'} . _(" (Default)");
 			} elsif ($printer->{SPOOLER} eq "cups") {
 			    ($cursorpos) = 
-				grep { $_ =~ /!$printer->{DEFAULT}:[^!]*$/ }
+				grep { /!$printer->{DEFAULT}:[^!]*$/ }
 			    printer::get_cups_remote_queues($printer);
 			}
 		    }
-- 
cgit v1.2.1