remove C<my $x if foo> construct from core modules

p4raw-id: //depot/perl@22322

8 files changed, 19 insertions, 14 deletions

diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm
index e3c7a1fcf3..d67aa01963 100644
--- a/lib/ExtUtils/Liblist/Kid.pm
+++ b/lib/ExtUtils/Liblist/Kid.pm
@@ -227,9 +227,9 @@ sub _win32_ext {
     return ("", "", "", "", ($give_libs ? [] : ())) unless $potential_libs;
 
     my $cc		= $Config{cc};
-    my $VC		= 1 if $cc =~ /^cl/i;
-    my $BC		= 1 if $cc =~ /^bcc/i;
-    my $GC		= 1 if $cc =~ /^gcc/i;
+    my $VC		= $cc =~ /^cl/i;
+    my $BC		= $cc =~ /^bcc/i;
+    my $GC		= $cc =~ /^gcc/i;
     my $so		= $Config{'so'};
     my $libs		= $Config{'perllibs'};
     my $libpth		= $Config{'libpth'};
diff --git a/lib/ExtUtils/MM_NW5.pm b/lib/ExtUtils/MM_NW5.pm
index 4e626cc23e..ca856df9da 100644
--- a/lib/ExtUtils/MM_NW5.pm
+++ b/lib/ExtUtils/MM_NW5.pm
@@ -32,9 +32,9 @@ use ExtUtils::MakeMaker qw( &neatvalue );
 
 $ENV{EMXSHELL} = 'sh'; # to run `commands`
 
-my $BORLAND  = 1 if $Config{'cc'} =~ /^bcc/i;
-my $GCC      = 1 if $Config{'cc'} =~ /^gcc/i;
-my $DMAKE    = 1 if $Config{'make'} =~ /^dmake/i;
+my $BORLAND  = $Config{'cc'} =~ /^bcc/i;
+my $GCC      = $Config{'cc'} =~ /^gcc/i;
+my $DMAKE    = $Config{'make'} =~ /^dmake/i;
 
 
 =item os_flavor
diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm
index 13b11237d7..fe3c170c6b 100644
--- a/lib/ExtUtils/MM_Win95.pm
+++ b/lib/ExtUtils/MM_Win95.pm
@@ -6,9 +6,9 @@ $VERSION = 0.03;
 require ExtUtils::MM_Win32;
 @ISA = qw(ExtUtils::MM_Win32);
 
-use Config;

-my $DMAKE = 1 if $Config{'make'} =~ /^dmake/i;
-my $NMAKE = 1 if $Config{'make'} =~ /^nmake/i;
+use Config;
+my $DMAKE = $Config{'make'} =~ /^dmake/i;
+my $NMAKE = $Config{'make'} =~ /^nmake/i;
 
 
 =head1 NAME
diff --git a/lib/Net/NNTP.pm b/lib/Net/NNTP.pm
index 79261f889d..acf2bf1162 100644
--- a/lib/Net/NNTP.pm
+++ b/lib/Net/NNTP.pm
@@ -21,7 +21,8 @@ sub new
 {
  my $self = shift;
  my $type = ref($self) || $self;
- my $host = shift if @_ % 2;
+ my $host;
+ $host = shift if @_ % 2;
  my %arg  = @_;
  my $obj;
 
diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm
index 7cd44ef179..01b0bb802e 100644
--- a/lib/Net/POP3.pm
+++ b/lib/Net/POP3.pm
@@ -21,7 +21,8 @@ sub new
 {
  my $self = shift;
  my $type = ref($self) || $self;
- my $host = shift if @_ % 2;
+ my $host;
+ $host = shift if @_ % 2;
  my %arg  = @_; 
  my $hosts = defined $host ? [ $host ] : $NetConfig{pop3_hosts};
  my $obj;
diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm
index be64037403..424854e540 100644
--- a/lib/Net/SMTP.pm
+++ b/lib/Net/SMTP.pm
@@ -24,7 +24,8 @@ sub new
 {
  my $self = shift;
  my $type = ref($self) || $self;
- my $host = shift if @_ % 2;
+ my $host;
+ $host = shift if @_ % 2;
  my %arg  = @_; 
  my $hosts = defined $host ? $host : $NetConfig{smtp_hosts};
  my $obj;
diff --git a/lib/Pod/Parser.pm b/lib/Pod/Parser.pm
index d12e01624a..653342e20c 100644
--- a/lib/Pod/Parser.pm
+++ b/lib/Pod/Parser.pm
@@ -1155,7 +1155,8 @@ sub parse_from_file {
     my $self = shift;
     my %opts = (ref $_[0] eq 'HASH') ? %{ shift() } : ();
     my ($infile, $outfile) = @_;
-    my ($in_fh,  $out_fh) = (gensym, gensym)  if ($] < 5.6);
+    my ($in_fh,  $out_fh);
+    ($in_fh,  $out_fh) = (gensym, gensym)  if ($] < 5.6);
     my ($close_input, $close_output) = (0, 0);
     local *myData = $self;
     local $_;
diff --git a/lib/Test/Harness.pm b/lib/Test/Harness.pm
index 6cd8b9eeca..35ceaaab88 100644
--- a/lib/Test/Harness.pm
+++ b/lib/Test/Harness.pm
@@ -463,7 +463,8 @@ sub _run_all_tests {
                 bench    => 0,
                );
 
-    my @dir_files = _globdir $Files_In_Dir if defined $Files_In_Dir;
+    my @dir_files;
+    @dir_files = _globdir $Files_In_Dir if defined $Files_In_Dir;
     my $t_start = new Benchmark;
 
     my $width = _leader_width(@tests);