use "\&" where possible when referring to subroutines

"*foo" is ambiguous in that it may refer to a bareword file handle;
so we'll use it where we can without triggering warnings.

PublicInbox::TestCommon::run_script_exit required dropping the
prototype, however.  We'll also future-proof by dropping "use
warnings" in Cgit.pm and use the less-ambiguous "//=" in Inbox.pm
while we're in the area.

diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index 9a51b451cfb59413d047cc21ca84b00ba4aaf64e..fb0d0e60244ab4e1599a3296183ff2de46490094 100644 (file)
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -10,9 +10,8 @@ use strict;
 use PublicInbox::GitHTTPBackend;
 use PublicInbox::Git;
 # not bothering with Exporter for a one-off
-*input_prepare = *PublicInbox::GitHTTPBackend::input_prepare;
-*serve = *PublicInbox::GitHTTPBackend::serve;
-use warnings;
+*input_prepare = \&PublicInbox::GitHTTPBackend::input_prepare;
+*serve = \&PublicInbox::GitHTTPBackend::serve;
 use PublicInbox::Qspawn;
 use PublicInbox::WwwStatic qw(r);
 

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 3b5ac970d07cf43af6d86b656d92606f108cefc9..b0894a7d6414d038d820afa4533a2c2f69321ddd 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -70,7 +70,7 @@ sub _cleanup_later ($) {
        my ($self) = @_;
        $cleanup_avail = cleanup_possible() if $cleanup_avail < 0;
        return if $cleanup_avail != 1;
-       $cleanup_timer ||= PublicInbox::DS::later(*cleanup_task);
+       $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
        $CLEANUP->{"$self"} = $self;
 }
 

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index b03e93e0f5b8e6fa96708467f210bf0167b54055..428191791b5ff35788dc365804d477eeec6a58a9 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -158,7 +158,7 @@ sub _undo_redirects ($) {
 # The default is 2.
 our $run_script_exit_code;
 sub RUN_SCRIPT_EXIT () { "RUN_SCRIPT_EXIT\n" };
-sub run_script_exit (;$) {
+sub run_script_exit {
        $run_script_exit_code = $_[0] // 0;
        die RUN_SCRIPT_EXIT;
 }
@@ -180,7 +180,7 @@ package $pkg;
 use strict;
 use subs qw(exit);
 
-*exit = *PublicInbox::TestCommon::run_script_exit;
+*exit = \\&PublicInbox::TestCommon::run_script_exit;
 sub main {
 # the below "line" directive is a magic comment, see perlsyn(1) manpage
 # line 1 "$f"

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 365743cfdf90d13bc4b56b95297dc1d04e93f716..0be3764c1a3ee28ab908200497336a1a9b42bf77 100644 (file)
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -60,9 +60,9 @@ sub list_404 ($$) { [] }
 
 # TODO: +cgit
 my %VALID = (
-       all => *list_all,
-       'match=domain' => *list_match_domain,
-       404 => *list_404,
+       all => \&list_all,
+       'match=domain' => \&list_match_domain,
+       404 => \&list_404,
 );
 
 sub set_cb ($$$) {

diff --git a/t/replace.t b/t/replace.t
index a1e2d63b6f8932aad5643473d833a787ff93f965..95241adf6842282eae8b4ce805d42b79ec8c5c02 100644 (file)
--- a/t/replace.t
+++ b/t/replace.t
@@ -179,10 +179,10 @@ EOF
        }
 }
 
-my $opt = { pre => *pad_msgs };
+my $opt = { pre => \&pad_msgs };
 test_replace(2, 'basic', {});
 test_replace(2, 'basic', $opt);
-test_replace(2, 'basic', $opt = { %$opt, post => *pad_msgs });
+test_replace(2, 'basic', $opt = { %$opt, post => \&pad_msgs });
 test_replace(2, 'basic', $opt = { %$opt, rotate_bytes => 1 });
 
 SKIP: {
@@ -190,9 +190,9 @@ SKIP: {
        PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 8;
        for my $l (qw(medium)) {
                test_replace(2, $l, {});
-               $opt = { pre => *pad_msgs };
+               $opt = { pre => \&pad_msgs };
                test_replace(2, $l, $opt);
-               test_replace(2, $l, $opt = { %$opt, post => *pad_msgs });
+               test_replace(2, $l, $opt = { %$opt, post => \&pad_msgs });
                test_replace(2, $l, $opt = { %$opt, rotate_bytes => 1 });
        }
 };

diff --git a/t/solver_git.t b/t/solver_git.t
index 78cc0edde0d29e9ac75bc4958f52bc090acae4ff..c162b60557cb540b578f7516c105e07cdfc02e55 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -41,7 +41,7 @@ $ibx->{-repo_objs} = [ $git ];
 my $res;
 my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
 open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!";
-my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http',
+my $psgi_env = { 'psgi.errors' => \*STDERR, 'psgi.url_scheme' => 'http',
                'HTTP_HOST' => 'example.com' };
 $solver->solve($psgi_env, $log, '69df7d5', {});
 ok($res, 'solved a blob!');

diff --git a/xt/msgtime_cmp.t b/xt/msgtime_cmp.t
index 0ce3c042217ddbf74dab648cd31b235265d347aa..aa96be4db4877a85dd26140031baa1bcdd2479aa 100644 (file)
--- a/xt/msgtime_cmp.t
+++ b/xt/msgtime_cmp.t
@@ -62,7 +62,7 @@ my $fh = $git->popen(@cat);
 while (<$fh>) {
        my ($oid, $type) = split / /;
        next if $type ne 'blob';
-       $git->cat_async($oid, *compare);
+       $git->cat_async($oid, \&compare);
 }
 $git->cat_async_wait;
 ok(1);