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

4 files changed, 21 insertions, 22 deletions

diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 3d392fa3e..693a332a0 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -27,7 +27,7 @@ sub ask_warn {
 }
 
 sub ask_fileW {
-    my ($o, $title, $dir) = @_;
+    my ($_o, $title, $dir) = @_;
     my $w = ugtk2->new($title);
     $dir .= '/' if $dir !~ m|/$|;
     ugtk2::_ask_file($w, $title, $dir); 
@@ -82,10 +82,10 @@ sub create_treeview_list {
     
     my $select = sub { $list_tv->set_cursor($_[0], $textcolumn, 0) };
 
-    my ($first_time, $starting_word, $start_reg) = (1, '', '^');
+    my ($starting_word, $start_reg) = ('', '^');
     my $timeout;
     $list_tv->signal_connect(key_press_event => sub {
-        my ($w, $event) = @_;
+        my ($_w, $event) = @_;
 	my $c = chr($event->keyval & 0xff);
 
 	Gtk2->timeout_remove($timeout) if $timeout; $timeout = '';
@@ -226,7 +226,7 @@ sub create_treeview_tree {
 	}
 	$path->free;
     });
-    my ($first_time, $starting_word, $start_reg) = (1, '', "^");
+    my ($starting_word, $start_reg) = ('', "^");
     my $timeout;
 
     my $toggle = sub {
@@ -240,7 +240,7 @@ sub create_treeview_tree {
     };
 
     $tree->signal_connect(key_press_event => sub {
-        my ($w, $event) = @_;
+        my ($_w, $event) = @_;
 	$selected_via_click = 0;
 	my $c = chr($event->keyval & 0xff);
 	$curr or return;
@@ -310,11 +310,10 @@ sub create_list {
     };
 
     my $tips = Gtk2::Tooltips->new;
-    my $toselect;
     each_index {
 	my $item = Gtk2::ListItem->new(may_apply($e->{format}, $_));
 	$item->signal_connect(key_press_event => sub {
-    	    my ($w, $event) = @_;
+    	    my ($_w, $event) = @_;
     	    my $c = chr($event->keyval & 0xff);
 	    $may_go_to_next->($event) if $event->keyval < 0x100 ? $c eq ' ' : $c eq "\r" || $c eq "\x8d";
     	    1;
@@ -331,7 +330,7 @@ sub create_list {
 
     #- signal_connect'ed after append_items otherwise it is called and destroys the default value
     $list->signal_connect(select_child => sub {
-	my ($w, $row) = @_;
+	my ($_w, $row) = @_;
 	${$e->{val}} = $l->[$list->child_position($row)];
 	&$changed;
     });
@@ -646,7 +645,7 @@ sub wait_messageW($$$) {
     $w;
 }
 sub wait_message_nextW {
-    my ($o, $messages, $w) = @_;
+    my ($_o, $messages, $w) = @_;
     my $msg = warp_text(join "\n", @$messages);
     return if $msg eq $w->{wait_messageW}->get; #- needed otherwise no expose_event :(
     $w->{displayed} = 0;
@@ -654,7 +653,7 @@ sub wait_message_nextW {
     $w->flush until $w->{displayed};
 }
 sub wait_message_endW {
-    my ($o, $w) = @_;
+    my ($_o, $w) = @_;
     $w->destroy;
 }
 
diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm
index 359e61401..a4f9e3bfd 100644
--- a/perl-install/interactive/http.pm
+++ b/perl-install/interactive/http.pm
@@ -53,7 +53,7 @@ sub exit() { end(); exit($_[1]) }
 END { end() }
 
 sub ask_fromW {
-    my ($o, $common, $l, $l2) = @_;
+    my ($o, $common, $l, $_l2) = @_;
 
   redisplay:
     my $uid = new_uid();
@@ -138,18 +138,18 @@ sub p {
 }
 
 sub wait_messageW {
-    my ($o, $title, $messages) = @_;
+    my ($_o, $_title, $messages) = @_;
     cont_stdout();
     print "\n" . CGI::p();
     p(@$messages);
 }
 
 sub wait_message_nextW {
-    my ($o, $messages, $w) = @_;
+    my ($_o, $messages, $_w) = @_;
     p(@$messages);
 }
 sub wait_message_endW {
-    my ($o, $w) = @_;
+    my ($_o, $_w) = @_;
     p(N("Done"));
     print "\n" . CGI::p();
 }
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 46f9797e5..1214de57b 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -81,7 +81,7 @@ sub ask_fromW {
 }
 
 sub ask_fromW_real {
-    my ($o, $common, $l, $l2) = @_;
+    my ($_o, $common, $l, $_l2) = @_;
     my $ignore; #-to handle recursivity
     my $old_focus = -2;
 
@@ -207,7 +207,7 @@ sub ask_fromW_real {
 	my ($f) = @_;
 
 	$get_all->();
-	my ($error, $focus) = $f->();
+	my ($error, $_focus) = $f->();
 	
 	if ($error) {
 	    $set_all->();
@@ -215,7 +215,7 @@ sub ask_fromW_real {
 	!$error;
     };
 
-    my ($destroyed, $canceled);
+    my ($canceled);
     do {
 	my $r = do {
 	    local $::setstep = 1;
@@ -256,7 +256,7 @@ sub waitbox {
 
 
 sub wait_messageW {
-    my ($o, $title, $messages) = @_;
+    my ($_o, $title, $messages) = @_;
     { form => waitbox($title, $messages), title => $title };
 }
 
@@ -266,8 +266,8 @@ sub wait_message_nextW {
     $o->wait_messageW($w->{title}, $messages);
 }
 sub wait_message_endW {
-    my ($o, $w) = @_;
-    my $wait = pop @wait_messages;
+    my ($_o, $_w) = @_;
+    my $_wait = pop @wait_messages;
 #    log::l("interactive_newt does not handle none stacked wait-messages") if $w->{form} != $wait;
     Newt::PopWindow();
 }
diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm
index 22a8e238e..a37b08c8e 100644
--- a/perl-install/interactive/stdio.pm
+++ b/perl-install/interactive/stdio.pm
@@ -34,7 +34,7 @@ sub good_choice {
 }
 
 sub ask_fromW {
-    my ($o, $common, $l, $l2) = @_;
+    my ($_o, $common, $l, $_l2) = @_;
 
     add2hash_($common, { ok => N("Ok"), cancel => N("Cancel") }) if !exists $common->{ok};
 
@@ -160,7 +160,7 @@ Your choice? ");
 }
 
 sub wait_messageW {
-    my ($o, $title, $message) = @_;
+    my ($_o, $_title, $message) = @_;
     print join "\n", @$message;
 }
 sub wait_message_nextW {