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.
- 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;
# 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;
- my ($self, $cb, $arg) = @_;
+ my ($self, $cb, @arg) = @_;
- $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) = @_;
}
# 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);
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);
}
warn "E: $@ in ${self}::event_step" if $@;
PublicInbox::DS::requeue($self) if defined($section);
}
- 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;
return if $other->{name} eq $cur->{name} || !$other->base_url;
eval { require PublicInbox::Msgmap };
my $ibxs = [];
my $found = [];
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;
return exact($ctx, $found, $mid) if @$found;
}
sub remove_eml_i { # each_inbox callback
}
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
eval {
# try to avoid taking a lock or unnecessary spawning
$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();
$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);
if ($flags =~ /\\Seen\b/) {
local $SIG{__WARN__} = warn_ignore_cb();
my $eml = PublicInbox::Eml->new($raw);
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";
}
} else {
die "BUG: destination unknown $inboxes";
}
} elsif ($inboxes eq 'watchspam') {
my $eml = PublicInbox::Eml->new(\$raw);
}
} 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";
}
} else {
die "BUG: destination unknown $inboxes";
}
use bytes (); # bytes::length
sub list_all_i {
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 = [];
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 {
$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;
}
if (!$ibx->{-hide}->{$hide_key} && grep(/$re/, @{$ibx->{url}})) {
push @$list, $ibx;
}
my $list = [];
my $host = $env->{HTTP_HOST} // $env->{SERVER_NAME};
$host =~ s/:[0-9]+\z//;
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);