treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / GetlineBody.pm

diff --git a/lib/PublicInbox/GetlineBody.pm b/lib/PublicInbox/GetlineBody.pm
index 0a922fd271ccd53426fe3caa18c11be105f3d8cf..92719a8255c56f46fcf9312ac7c669a6f64104da 100644 (file)
--- a/lib/PublicInbox/GetlineBody.pm
+++ b/lib/PublicInbox/GetlineBody.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Wrap a pipe or file for PSGI streaming response bodies and calls the
@@ -13,12 +13,13 @@ use strict;
 use warnings;
 
 sub new {
-       my ($class, $rpipe, $end, $buf, $filter) = @_;
+       my ($class, $rpipe, $end, $end_arg, $buf) = @_;
        bless {
                rpipe => $rpipe,
                end => $end,
+               end_arg => $end_arg,
                buf => $buf,
-               filter => $filter || 0,
+               filter => 0,
        }, $class;
 }
 
@@ -35,15 +36,14 @@ sub getline {
        my $buf = delete $self->{buf}; # initial buffer
        $buf = $self->{rpipe}->getline unless defined $buf;
        $self->{filter} = -1 unless defined $buf; # set EOF for next call
-       $filter ? $filter->($buf) : $buf;
+       $buf;
 }
 
 sub close {
        my ($self) = @_;
-       my $rpipe = delete $self->{rpipe};
+       my ($rpipe, $end, $end_arg) = delete @$self{qw(rpipe end end_arg)};
        close $rpipe if $rpipe;
-       my $end = delete $self->{end};
-       $end->() if $end;
+       $end->($end_arg) if $end;
 }
 
 1;