From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 9AE331F4BD for ; Mon, 24 Jun 2019 02:55:34 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 27/57] http: don't pass extra args to PublicInbox::DS::close Date: Mon, 24 Jun 2019 02:52:28 +0000 Message-Id: <20190624025258.25592-28-e@80x24.org> In-Reply-To: <20190624025258.25592-1-e@80x24.org> References: <20190624025258.25592-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: YAGNI Followup-to: commit 30ab5cf82b9d47242640f748a0f9a088ca783e32 ("ds: reduce Errno imports and drop ->close reason") --- lib/PublicInbox/HTTP.pm | 4 ++-- lib/PublicInbox/HTTPD/Async.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index 94972054..c81aeacd 100644 --- a/lib/PublicInbox/HTTP.pm +++ b/lib/PublicInbox/HTTP.pm @@ -438,7 +438,7 @@ sub quit { } sub close { - my $self = shift; + my $self = $_[0]; if (my $env = delete $self->{env}) { delete $env->{'psgix.io'}; # prevent circular references } @@ -447,7 +447,7 @@ sub close { eval { $forward->close }; err($self, "forward ->close error: $@") if $@; } - $self->SUPER::close(@_); + $self->SUPER::close; # PublicInbox::DS::close } # for graceful shutdown in PublicInbox::Daemon: diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm index bec49337..e6df58eb 100644 --- a/lib/PublicInbox/HTTPD/Async.pm +++ b/lib/PublicInbox/HTTPD/Async.pm @@ -80,9 +80,9 @@ sub async_pass { sub event_step { $_[0]->{cb}->(@_) } sub close { - my $self = shift; + my $self = $_[0]; delete $self->{cb}; - $self->SUPER::close(@_); + $self->SUPER::close; # we defer this to the next timer loop since close is deferred if (my $cleanup = delete $self->{cleanup}) { -- EW