summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBugzilla/Bug.pm2
-rw-r--r--Bugzilla/Chart.pm5
-rw-r--r--Bugzilla/Util.pm28
-rw-r--r--t/007util.t7
-rwxr-xr-xvotes.cgi2
5 files changed, 9 insertions, 35 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 8be6705ef..8b6302b92 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -43,6 +43,8 @@ use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Product;
+use List::Util qw(min);
+
use base qw(Exporter);
@Bugzilla::Bug::EXPORT = qw(
AppendComment ValidateComment
diff --git a/Bugzilla/Chart.pm b/Bugzilla/Chart.pm
index b2db9da30..729120e8e 100644
--- a/Bugzilla/Chart.pm
+++ b/Bugzilla/Chart.pm
@@ -38,6 +38,7 @@ use Bugzilla::Series;
use Date::Format;
use Date::Parse;
+use List::Util qw(max);
sub new {
my $invocant = shift;
@@ -313,10 +314,10 @@ sub readData {
my $datediff = shift @datediff_total;
push @processed_datediff, $datediff if defined($datediff);
}
- $self->{'y_max_value'} = Bugzilla::Util::max(@processed_datediff);
+ $self->{'y_max_value'} = max(@processed_datediff);
}
else {
- $self->{'y_max_value'} = Bugzilla::Util::max(@maxvals);
+ $self->{'y_max_value'} = max(@maxvals);
}
$self->{'y_max_value'} |= 1; # For log()
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 6660fff91..c5cfc0444 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -35,7 +35,7 @@ use base qw(Exporter);
html_quote url_quote value_quote xml_quote
css_class_quote
i_am_cgi get_netaddr
- lsearch max min
+ lsearch
diff_arrays diff_strings
trim wrap_comment find_wrap_point
perform_substs
@@ -158,22 +158,6 @@ sub lsearch {
return -1;
}
-sub max {
- my $max = shift(@_);
- foreach my $val (@_) {
- $max = $val if $val > $max;
- }
- return $max;
-}
-
-sub min {
- my $min = shift(@_);
- foreach my $val (@_) {
- $min = $val if $val < $min;
- }
- return $min;
-}
-
sub diff_arrays {
my ($old_ref, $new_ref) = @_;
@@ -450,8 +434,6 @@ Bugzilla::Util - Generic utility functions for bugzilla
# Functions for searching
$loc = lsearch(\@arr, $val);
- $val = max($a, $b, $c);
- $val = min($a, $b, $c);
# Data manipulation
($removed, $added) = diff_arrays(\@old, \@new);
@@ -598,14 +580,6 @@ reference.
If the item is not in the list, returns -1.
-=item C<max($a, $b, ...)>
-
-Returns the maximum from a set of values.
-
-=item C<min($a, $b, ...)>
-
-Returns the minimum from a set of values.
-
=back
=head2 Data Manipulation
diff --git a/t/007util.t b/t/007util.t
index 3adbe0ab4..5f2c998d1 100644
--- a/t/007util.t
+++ b/t/007util.t
@@ -28,7 +28,7 @@ use lib 't';
use Support::Files;
BEGIN {
- use Test::More tests => 15;
+ use Test::More tests => 13;
use_ok(Bugzilla);
use_ok(Bugzilla::Util);
}
@@ -57,11 +57,6 @@ is(lsearch(\@list,'pear'),1,'lsearch 1');
is(lsearch(\@list,'<"\\%'),3,'lsearch 2');
is(lsearch(\@list,'kiwi'),-1,'lsearch 3 (missing item)');
-#max() and min():
-@list = (7,27,636,2);
-is(max(@list),636,'max()');
-is(min(@list),2,'min()');
-
#trim():
is(trim(" fg<*\$%>+=~~ "),'fg<*$%>+=~~','trim()');
diff --git a/votes.cgi b/votes.cgi
index 36661c278..bb2948b37 100755
--- a/votes.cgi
+++ b/votes.cgi
@@ -36,6 +36,8 @@ use Bugzilla::Bug;
use Bugzilla::User;
use Bugzilla::Product;
+use List::Util qw(min);
+
my $cgi = Bugzilla->cgi;
my $template = Bugzilla->template;
my $vars = {};