config: flatten each_inbox and iterate_start args

In Perl, we can simplify callers by passing a single array
all the way down the stack instead of a single array ref which
needs to be expanded every call.

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index ae9ad8deef9e910bd89c35388278522b388e47aa..f78115b6e47b62c91f73b1d1599023774176de39 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -90,29 +90,29 @@ sub lookup_name ($$) {
 }
 
 sub each_inbox {
-       my ($self, $cb, $arg) = @_;
+       my ($self, $cb, @arg) = @_;
        # may auto-vivify if config file is non-existent:
        foreach my $section (@{$self->{-section_order}}) {
                next if $section !~ m!\Apublicinbox\.([^/]+)\z!;
                my $ibx = lookup_name($self, $1) or next;
-               $cb->($ibx, $arg);
+               $cb->($ibx, @arg);
        }
 }
 
 sub iterate_start {
-       my ($self, $cb, $arg) = @_;
+       my ($self, $cb, @arg) = @_;
        my $i = 0;
-       $self->{-iter} = [ \$i, $cb, $arg ];
+       $self->{-iter} = [ \$i, $cb, @arg ];
 }
 
 # for PublicInbox::DS::next_tick, we only call this is if
 # PublicInbox::DS is already loaded
 sub event_step {
        my ($self) = @_;
-       my ($i, $cb, $arg) = @{$self->{-iter}};
+       my ($i, $cb, @arg) = @{$self->{-iter}};
        my $section = $self->{-section_order}->[$$i++];
        delete($self->{-iter}) unless defined($section);
-       eval { $cb->($self, $section, $arg) };
+       eval { $cb->($self, $section, @arg) };
        warn "E: $@ in ${self}::event_step" if $@;
        PublicInbox::DS::requeue($self) if defined($section);
 }

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 5dffc65c9150f04db7ad2bde10c9921fc95075fd..929737f1b9d1961f4c63f556c313494df0db90fb 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -74,8 +74,7 @@ sub search_partial ($$) {
 }
 
 sub ext_msg_i {
-       my ($other, $arg) = @_;
-       my ($cur, $mid, $ibxs, $found) = @$arg;
+       my ($other, $cur, $mid, $ibxs, $found) = @_;
 
        return if $other->{name} eq $cur->{name} || !$other->base_url;
 
@@ -101,9 +100,9 @@ sub ext_msg {
        eval { require PublicInbox::Msgmap };
        my $ibxs = [];
        my $found = [];
-       my $arg = [ $cur, $mid, $ibxs, $found ];
 
-       $ctx->{www}->{pi_config}->each_inbox(\&ext_msg_i, $arg);
+       $ctx->{www}->{pi_config}->each_inbox(\&ext_msg_i,
+                                               $cur, $mid, $ibxs, $found);
 
        return exact($ctx, $found, $mid) if @$found;
 

diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 17786377ba8127fe7744acc14216f873ec71edf7..0f41dff289d6e72a318fc85e7c2dafbcf023f3bd 100644 (file)
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -133,8 +133,7 @@ sub _done_for_now {
 }
 
 sub remove_eml_i { # each_inbox callback
-       my ($ibx, $arg) = @_;
-       my ($self, $eml, $loc) = @$arg;
+       my ($ibx, $self, $eml, $loc) = @_;
 
        eval {
                # try to avoid taking a lock or unnecessary spawning
@@ -176,7 +175,7 @@ sub _remove_spam {
        $path =~ /:2,[A-R]*S[T-Za-z]*\z/ or return;
        my $eml = eml_from_path($path) or return;
        local $SIG{__WARN__} = warn_ignore_cb();
-       $self->{config}->each_inbox(\&remove_eml_i, [ $self, $eml, $path ]);
+       $self->{config}->each_inbox(\&remove_eml_i, $self, $eml, $path);
 }
 
 sub import_eml ($$$) {
@@ -419,8 +418,8 @@ sub imap_import_msg ($$$$$) {
                if ($flags =~ /\\Seen\b/) {
                        local $SIG{__WARN__} = warn_ignore_cb();
                        my $eml = PublicInbox::Eml->new($raw);
-                       my $arg = [ $self, $eml, "$url UID:$uid" ];
-                       $self->{config}->each_inbox(\&remove_eml_i, $arg);
+                       $self->{config}->each_inbox(\&remove_eml_i,
+                                               $self, $eml, "$url UID:$uid");
                }
        } else {
                die "BUG: destination unknown $inboxes";
@@ -967,8 +966,8 @@ sub nntp_fetch_all ($$$) {
                        }
                } elsif ($inboxes eq 'watchspam') {
                        my $eml = PublicInbox::Eml->new(\$raw);
-                       my $arg = [ $self, $eml, "$url ARTICLE $art" ];
-                       $self->{config}->each_inbox(\&remove_eml_i, $arg);
+                       $self->{config}->each_inbox(\&remove_eml_i,
+                                       $self, $eml, "$url ARTICLE $art");
                } else {
                        die "BUG: destination unknown $inboxes";
                }

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 12b0d9ad5f3f0bedae69919f3a9a4b0de557ff1f..a7c7cbc1239e6025e6594524a68ed803263dfcb1 100644 (file)
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -12,21 +12,19 @@ use PublicInbox::ManifestJsGz;
 use bytes (); # bytes::length
 
 sub list_all_i {
-       my ($ibx, $arg) = @_;
-       my ($list, $hide_key) = @$arg;
+       my ($ibx, $list, $hide_key) = @_;
        push @$list, $ibx unless $ibx->{-hide}->{$hide_key};
 }
 
 sub list_all ($$$) {
        my ($self, $env, $hide_key) = @_;
        my $list = [];
-       $self->{pi_config}->each_inbox(\&list_all_i, [ $list, $hide_key ]);
+       $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;
+       my ($ibx, $list, $hide_key, $re) = @_;
        if (!$ibx->{-hide}->{$hide_key} && grep(/$re/, @{$ibx->{url}})) {
                push @$list, $ibx;
        }
@@ -37,9 +35,8 @@ sub list_match_domain ($$$) {
        my $list = [];
        my $host = $env->{HTTP_HOST} // $env->{SERVER_NAME};
        $host =~ s/:[0-9]+\z//;
-       my $arg = [ $list, $hide_key,
-               qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i ];
-       $self->{pi_config}->each_inbox(\&list_match_domain_i, $arg);
+       $self->{pi_config}->each_inbox(\&list_match_domain_i, $list, $hide_key,
+                               qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i);
        $list;
 }