Merge branch 'no-closure'

* no-closure: (30 commits)
  search: retry_reopen passes user arg to callback
  solvergit: allow passing arg to user-supplied callback
  viewvcs: avoid anonymous sub for HTML response
  wwwattach: avoid anonymous sub for msg_iter
  view: msg_iter calls add_body_text directly
  searchview: remove anonymous sub when sorting threads by relevance
  view: thread_html: pass named sub to WwwStream
  searchview: pass named subs to Www*Stream
  wwwtext: avoid anonymous sub in response
  contentid: no anonymous sub
  view: msg_html: stop using an anonymous sub
  view: avoid anon sub in stream_thread
  config: each_inbox: pass user arg to callback
  feed: avoid anonymous subs
  mboxgz: pass $ctx to callback to avoid anon subs
  www: lazy load Plack::Util
  githttpbackend: split out wwwstatic
  qspawn: psgi_return: allow non-anon parse_hdr callback
  qspawn: drop "qspawn.filter" support, for now
  qspawn: psgi_qx: eliminate anonymous subs
  ...

1 files changed, 22 insertions, 15 deletions

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index e19ae8a1..7995b315 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -16,29 +16,36 @@ require Digest::SHA;
 require File::Spec;
 *try_cat = \&PublicInbox::Inbox::try_cat;
 
+sub list_all_i {
+        my ($ibx, $arg) = @_;
+        my ($list, $hide_key) = @$arg;
+        push @$list, $ibx unless $ibx->{-hide}->{$hide_key};
+}
+
 sub list_all ($$$) {
         my ($self, $env, $hide_key) = @_;
-        my @list;
-        $self->{pi_config}->each_inbox(sub {
-                my ($ibx) = @_;
-                push @list, $ibx unless $ibx->{-hide}->{$hide_key};
-        });
-        \@list;
+        my $list = [];
+        $self->{pi_config}->each_inbox(\&list_all_i, [ $list, $hide_key ]);
+        $list;
+}
+
+sub list_match_domain_i {
+        my ($ibx, $arg) = @_;
+        my ($list, $hide_key, $re) = @$arg;
+        if (!$ibx->{-hide}->{$hide_key} && $ibx->{url} =~ $re) {
+                push @$list, $ibx;
+        }
 }
 
 sub list_match_domain ($$$) {
         my ($self, $env, $hide_key) = @_;
-        my @list;
+        my $list = [];
         my $host = $env->{HTTP_HOST} // $env->{SERVER_NAME};
         $host =~ s/:[0-9]+\z//;
-        my $re = qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i;
-        $self->{pi_config}->each_inbox(sub {
-                my ($ibx) = @_;
-                if (!$ibx->{-hide}->{$hide_key} && $ibx->{url} =~ $re) {
-                        push @list, $ibx;
-                }
-        });
-        \@list;
+        my $arg = [ $list, $hide_key,
+                qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i ];
+        $self->{pi_config}->each_inbox(\&list_match_domain_i, $arg);
+        $list;
 }
 
 sub list_404 ($$) { [] }