From 9ba3b5ba7379ac06399d7b296e7796b65fad6149 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 5 Aug 2016 20:12:42 +0000 Subject: [PATCH] Drop more unused variables Signed-off-by: Niels Thykier --- Debbugs/CGI.pm | 5 ----- Debbugs/CGI/Bugreport.pm | 1 - Debbugs/Control.pm | 38 ++++---------------------------------- Debbugs/Control/Service.pm | 2 -- Debbugs/Estraier.pm | 1 - Debbugs/Packages.pm | 3 --- Debbugs/Recipients.pm | 3 +-- Debbugs/SOAP.pm | 1 - Debbugs/Status.pm | 1 - Debbugs/Text.pm | 1 - 10 files changed, 5 insertions(+), 51 deletions(-) diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm index 393b406..9cc4d51 100644 --- a/Debbugs/CGI.pm +++ b/Debbugs/CGI.pm @@ -624,10 +624,6 @@ sub htmlize_maintlinks { return htmlize_addresslinks($prefixfunc, \&mainturl, $maints); } - -our $_maintainer; -our $_maintainer_rev; - =head2 bug_linklist bug_linklist($separator,$class,@bugs) @@ -843,7 +839,6 @@ sub option_form{ for my $key (keys %{$param{form_option}}) { # strip out leader; shouldn't be anything here without one, # but skip stupid things anyway - my $o_key = $key; next unless $key =~ s/^\Q$form_option_leader\E//; if ($key =~ /^add_(.+)$/) { # this causes a specific parameter to be added diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm index 9ca67ed..888a1b3 100644 --- a/Debbugs/CGI/Bugreport.pm +++ b/Debbugs/CGI/Bugreport.pm @@ -126,7 +126,6 @@ sub display_entity { my $output = globify_scalar($param{output}); my $entity = $param{entity}; my $ref = $param{bug_num}; - my $top = $param{outer}; my $xmessage = $param{msg_num}; my $attachments = $param{attachments}; diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 416abc1..6f74206 100644 --- a/Debbugs/Control.pm +++ b/Debbugs/Control.pm @@ -444,7 +444,6 @@ sub set_blocks { } } } - my @new_blockers = keys %blockers; for my $data (@data) { my $old_data = dclone($data); # remove blockers and/or add new ones as appropriate @@ -487,9 +486,7 @@ sub set_blocks { $mungable_blocks{add} = \%added_blockers if keys %added_blockers; my $new_locks = 0; for my $add_remove (keys %mungable_blocks) { - my @munge_blockers; my %munge_blockers; - my $block_locks = 0; for my $blocker (keys %{$mungable_blocks{$add_remove}}) { next if $munge_blockers{$blocker}; my ($temp_locks, @blocking_data) = @@ -628,10 +625,8 @@ sub set_tag { __begin_control(%param, command => 'tag' ); - my ($debug,$transcript) = - @info{qw(debug transcript)}; + my $transcript = $info{transcript}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my @tags = make_list($param{tag}); if (not @tags and ($param{remove} or $param{add})) { if ($param{remove}) { @@ -649,11 +644,9 @@ sub set_tag { my $action = 'Did not alter tags'; my %tag_added = (); my %tag_removed = (); - my %fixed_removed = (); my @old_tags = split /\,?\s+/, $data->{keywords}; my %tags; @tags{@old_tags} = (1) x @old_tags; - my $reopened = 0; my $old_data = dclone($data); if (not $param{add} and not $param{remove}) { $tag_removed{$_} = 1 for @old_tags; @@ -773,10 +766,8 @@ sub set_severity { __begin_control(%param, command => 'severity' ); - my ($debug,$transcript) = - @info{qw(debug transcript)}; + my $transcript = $info{transcript}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; for my $data (@data) { @@ -878,10 +869,8 @@ sub set_done { __begin_control(%param, command => $param{reopen}?'reopen':'done', ); - my ($debug,$transcript) = - @info{qw(debug transcript)}; + my $transcript = $info{transcript}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action =''; if ($param{reopen}) { @@ -941,7 +930,6 @@ sub set_done { } else { my %submitter_notified; - my $requester_notified = 0; my $orig_report_set = 0; for my $data (@data) { if (exists $data->{done} and @@ -1100,7 +1088,6 @@ sub set_submitter { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; # here we only concern ourselves with the first of the merged bugs for my $data ($data[0]) { @@ -1215,7 +1202,6 @@ sub set_forwarded { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; for my $data (@data) { my $old_data = dclone($data); @@ -1304,7 +1290,6 @@ sub set_title { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; for my $data (@data) { my $old_data = dclone($data); @@ -1399,7 +1384,6 @@ sub set_package { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; # clean up the new package my $new_package = join(',', @@ -1523,7 +1507,6 @@ sub set_found { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my %versions; for my $version (make_list($param{found})) { next unless defined $version; @@ -1743,7 +1726,6 @@ sub set_fixed { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my %versions; for my $version (make_list($param{fixed})) { next unless defined $version; @@ -1970,7 +1952,6 @@ sub set_merged { return; } my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my %data; my %merged_bugs; for my $data (@data) { @@ -1981,7 +1962,6 @@ sub set_merged { # handle unmerging my $new_locks = 0; if (not exists $param{merge_with}) { - my $ok_to_unmerge = 1; delete $merged_bugs{$param{bug}}; if (not keys %merged_bugs) { print {$transcript} "Ignoring request to unmerge a bug which is not merged with any others.\n"; @@ -2015,9 +1995,6 @@ sub set_merged { return; } # lock and load all of the bugs we need - my @bugs_to_load = keys %merging; - my $bug_to_load; - my %merge_added; my ($data,$n_locks) = __lock_and_load_merged_bugs(bugs_to_load => [keys %merging], data => \@data, @@ -2109,7 +2086,6 @@ sub set_merged { my %target_blockedby; @target_blockedby{@{$change->{func_value}}} = (1) x @{$change->{func_value}}; my %unhandled_targets = %target_blockedby; - my @blocks_to_remove; for my $key (split / /,$change->{orig_value}) { delete $unhandled_targets{$key}; next if exists $target_blockedby{$key}; @@ -2560,7 +2536,6 @@ sub affects { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; for my $data (@data) { $action = ''; @@ -2738,7 +2713,6 @@ sub _summary { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; # figure out the log that we're going to use my $summary = ''; my $summary_msg = ''; @@ -2894,10 +2868,8 @@ sub clone_bug { __begin_control(%param, command => 'clone' ); - my ($debug,$transcript) = - @info{qw(debug transcript)}; + my $transcript = $info{transcript}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; for my $data (@data) { @@ -3029,7 +3001,6 @@ sub owner { my ($debug,$transcript) = @info{qw(debug transcript)}; my @data = @{$info{data}}; - my @bugs = @{$info{bugs}}; my $action = ''; for my $data (@data) { print {$debug} "Going to change owner to '".(defined $param{owner}?$param{owner}:'(going to unset it)')."'\n"; @@ -3242,7 +3213,6 @@ sub bug_unarchive { command=>'unarchive'); my ($debug,$transcript) = @info{qw(debug transcript)}; - my @data = @{$info{data}}; my @bugs = @{$info{bugs}}; my $action = "$config{bug} unarchived."; my @files_to_remove; diff --git a/Debbugs/Control/Service.pm b/Debbugs/Control/Service.pm index 42f3801..32e1f97 100644 --- a/Debbugs/Control/Service.pm +++ b/Debbugs/Control/Service.pm @@ -561,9 +561,7 @@ sub control_line { print {$transcript} "Failed to forcibly merge $ref: ".cleanup_eval_fail($@,$debug)."\n"; } } elsif ($ctl eq 'clone') { - my $origref = $matches[0]; my @newclonedids = split /\s+/, $matches[1]; - my $newbugsneeded = scalar(@newclonedids); eval { my %new_clones; diff --git a/Debbugs/Estraier.pm b/Debbugs/Estraier.pm index 7ada02d..174ad4c 100644 --- a/Debbugs/Estraier.pm +++ b/Debbugs/Estraier.pm @@ -95,7 +95,6 @@ sub remove_old_messages{ my $cond = new Search::Estraier::Condition; $cond->add_attr('@uri STRBW '.$bug_num.'/'); $cond->set_max(50); - my $skip; my $nres; while ($nres = $est->search($cond,0) and $nres->doc_num > 0){ for my $rdoc (map {$nres->get_doc($_)} 0..($nres->doc_num-1)) { diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm index f2ba789..c7fd47c 100644 --- a/Debbugs/Packages.pm +++ b/Debbugs/Packages.pm @@ -234,7 +234,6 @@ sub binary_to_source{ } } else { - my $found_one_version = 0; for my $version (@versions) { next unless exists $bin->{$version}; if (exists $bin->{$version}{all}) { @@ -530,7 +529,6 @@ sub makesourceversions { arch => 'source', versions => '0.1.1', guess_source => 1, - debug => \$debug, warnings => \$warnings, ); @@ -573,7 +571,6 @@ sub make_source_versions { }, ); my ($warnings) = globify_scalar(exists $param{warnings}?$param{warnings}:undef); - my ($debug) = globify_scalar(exists $param{debug} ?$param{debug} :undef); my @packages = grep {defined $_ and length $_ } make_list($param{package}); my @archs = grep {defined $_ } make_list ($param{arch}); diff --git a/Debbugs/Recipients.pm b/Debbugs/Recipients.pm index f9b2c73..fe99f25 100644 --- a/Debbugs/Recipients.pm +++ b/Debbugs/Recipients.pm @@ -111,8 +111,7 @@ sub add_recipients { } return; } - my ($p, $addmaint); - my $anymaintfound=0; my $anymaintnotfound=0; + my ($addmaint); my $ref = $param{data}{bug_num}; for my $p (splitpackages($param{data}{package})) { $p = lc($p); diff --git a/Debbugs/SOAP.pm b/Debbugs/SOAP.pm index 7508e94..9ed0249 100644 --- a/Debbugs/SOAP.pm +++ b/Debbugs/SOAP.pm @@ -233,7 +233,6 @@ sub get_bug_log{ my %seen_msg_ids; my $current_msg=0; - my $status = {}; my @messages; while (my $record = $log->read_record()) { $current_msg++; diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm index 72e9ae6..dabf811 100644 --- a/Debbugs/Status.pm +++ b/Debbugs/Status.pm @@ -416,7 +416,6 @@ data. =cut sub lockreadbugmerge { - my ($bug_num,$location) = @_; my $data = lockreadbug(@_); if (not defined $data) { return (0,undef); diff --git a/Debbugs/Text.pm b/Debbugs/Text.pm index 21bde01..3c34b97 100644 --- a/Debbugs/Text.pm +++ b/Debbugs/Text.pm @@ -64,7 +64,6 @@ use Data::Dumper; our %tt_templates; our %filled_templates; our $safe; -our $hole = Safe::Hole->new({}); our $language; # This function is what is called when someone does include('foo/bar') -- 2.39.2