remove unused variables or rename them with an underscore (eg: $o becomes $_o)

6 files changed, 7 insertions, 9 deletions

diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index adca31e0e..6baa84f78 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -54,7 +54,7 @@ sub configure_everything {
     $options->{VideoRam_probed} = $X->{monitor}{VideoRam_probed};
     $ok &&= $X->{card} = Xconfig::card::configure($in, $raw_X, $do_pkgs, $auto, $options);
     $ok &&= Xconfig::screen::configure($raw_X, $X->{card});
-    $ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor}, $auto);
+    $ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor});
     $ok &&= Xconfig::test::test($in, $raw_X, $X->{card}, $auto, 'skip_badcard');
 
     if (!$ok) {
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 8038818cd..3d9415dff 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -161,7 +161,7 @@ sub getinfoFromDDC {
 	push @Modes, [ $x, $y, $depth ];
     }
 
-    my ($h, $v, $size, @m) = @l;
+    my ($h, $v, $size, @_modes) = @l;
     { 
         VideoRam_probed => to_int($VideoRam),
         HorizSync => first($h =~ /^(\S*)/), 
diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm
index 0099b4666..a2e662009 100644
--- a/perl-install/Xconfig/parse.pm
+++ b/perl-install/Xconfig/parse.pm
@@ -35,7 +35,6 @@ sub raw_from_file { #- internal
 
     $lines ||= [ cat_($file) ];
     my $line;
-    my $weird = sub { warn "$file:$line: strange $_[0]" };
 
     my ($comment, $obj, @objs);
 
@@ -81,7 +80,7 @@ sub raw_from_file { #- internal
 	} elsif (/^EndSubsection/i) {
 	    die "$file:$line: not in Subsection\n"     if !@objs || $objs[0]{kind} ne 'Subsection';
 	    $attach_comment->('post');
-	    my $e = shift @objs; $obj = '';
+	    shift @objs; $obj = '';
 	} else {
 	    die "$file:$line: not in Section\n" if !@objs;
 
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index daeac5806..f3d7769a3 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -138,7 +138,7 @@ sub choose {
 
 
 sub choices {
-    my ($raw_X, $resolution_wanted, $card, $monitor) = @_;
+    my ($_raw_X, $resolution_wanted, $card, $monitor) = @_;
     $resolution_wanted ||= {};
 
     my ($prefered_depth, @resolutions) = allowed($card);
@@ -169,7 +169,7 @@ sub choices {
 }
 
 sub configure {
-    my ($in, $raw_X, $card, $monitor, $auto) = @_;
+    my ($in, $raw_X, $card, $monitor) = @_;
 
     my ($default_resolution, @resolutions) = choices($raw_X, $raw_X->get_resolution, $card, $monitor);
 
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm
index 307c0ff7a..4fafaafa8 100644
--- a/perl-install/Xconfig/test.pm
+++ b/perl-install/Xconfig/test.pm
@@ -26,7 +26,6 @@ sub test {
     return 1 if $skip_badcard && $bad_card;
 
     if ($bad_card || !$auto) {
-	my $msg = 
 	$in->ask_yesorno(N("Test of the configuration"), 
 			 N("Do you want to test the configuration?") . ($bad_card ? "\n" . N("Warning: testing this graphic card may freeze your computer") : ''),
 			 !$bad_card) or return 1;
@@ -64,7 +63,7 @@ sub test {
 
     do { sleep 1 } until xtest(":9") || waitpid($pid, c::WNOHANG());
 
-    my $b = before_leaving { unlink $f_err };
+    my $_b = before_leaving { unlink $f_err };
 
     if (!xtest(":9")) {
 	open(my $F, $f_err);
diff --git a/perl-install/Xconfig/xfree4.pm b/perl-install/Xconfig/xfree4.pm
index 88cad5b06..7dd57dab1 100644
--- a/perl-install/Xconfig/xfree4.pm
+++ b/perl-install/Xconfig/xfree4.pm
@@ -123,7 +123,7 @@ sub new_screen_sections {
 }
 
 sub set_Option {
-    my ($raw_X, $category, $node, @names) = @_;
+    my ($_raw_X, $category, $node, @names) = @_;
     
     if (member($category, 'keyboard', 'mouse')) {
 	#- everything we export is an Option