From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 111D61F723 for ; Fri, 27 Oct 2023 01:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1698369285; bh=H7fdIZdVLmv+HyejM3EW5KS4sip4h8MLimFqCJHxtj0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=U/PyfcF7HspMEH86xS9WKwA3qoEq84zQThsuSo/dMQbwQ/FFjwvTexi4glhhCzlTV Go7sjqBLWQb5+QQohcgsI7u23m+hA7QWjHnaXP2TAwKIM2YpZl0Y/fafP9NyXLWbBA EEhPNyWJiAo7TW1Mzyg1ewpAjXt+8XaQr2APcP3g= From: Eric Wong To: spew@80x24.org Subject: [PATCH 8/8] treewide: use ->close method rather than CORE::close Date: Fri, 27 Oct 2023 01:14:43 +0000 Message-ID: <20231027011443.3709841-8-e@80x24.org> In-Reply-To: <20231027011443.3709841-1-e@80x24.org> References: <20231027011443.3709841-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: It's easier-to-read and should open the door for us to get rid of `tie' for ProcessIO without performance penalties for more frequently-used perlop calls and `stat' usage. --- lib/PublicInbox/CodeSearchIdx.pm | 6 +++--- lib/PublicInbox/DS.pm | 4 ++-- lib/PublicInbox/DirIdle.pm | 2 +- lib/PublicInbox/Gcf2.pm | 2 +- lib/PublicInbox/Git.pm | 6 +++--- lib/PublicInbox/HTTP.pm | 4 ++-- lib/PublicInbox/LeiMirror.pm | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index bf410734..c1a1ee90 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -480,11 +480,11 @@ sub partition_refs ($$$) { $seen = 0; } if ($DO_QUIT) { - CORE::close($rfh); + $rfh->close; return (); } } - CORE::close($rfh); + $rfh->close; return () if $DO_QUIT; if (!$? || (($? & 127) == POSIX::SIGPIPE && $seen > $SEEN_MAX)) { my $n = $NCHANGE - $n0; @@ -887,7 +887,7 @@ sub associate { ++$score{"$ibx_id $_"} for @root_ids; } } - CORE::close $rd or die "@join failed: $?=$?"; + $rd->close or die "fatal: @join failed: \$?=$?"; my $min = $self->{-opt}->{'assoc-min'} // 10; progress($self, scalar(keys %score).' potential pairings...'); for my $k (keys %score) { diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 6041c6b5..d8c84884 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -361,8 +361,8 @@ sub greet { my $ev = EPOLLIN; my $wbuf; if ($sock->can('accept_SSL') && !$sock->accept_SSL) { - return CORE::close($sock) if $! != EAGAIN; - $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock); + return $sock->close if $! != EAGAIN; + $ev = PublicInbox::TLS::epollbit() or return $sock->close; $wbuf = [ \&accept_tls_step, $self->can('do_greet')]; } new($self, $sock, $ev | EPOLLONESHOT); diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm index de6f229b..e6a326ab 100644 --- a/lib/PublicInbox/DirIdle.pm +++ b/lib/PublicInbox/DirIdle.pm @@ -89,7 +89,7 @@ sub force_close { my ($self) = @_; my $inot = delete $self->{inot} // return; if ($inot->can('fh')) { # Linux::Inotify2 2.3+ - CORE::close($inot->fh) or warn "CLOSE ERROR: $!"; + $inot->fh->close or warn "CLOSE ERROR: $!"; } elsif ($inot->isa('Linux::Inotify2')) { require PublicInbox::LI2Wrap; PublicInbox::LI2Wrap::wrapclose($inot); diff --git a/lib/PublicInbox/Gcf2.pm b/lib/PublicInbox/Gcf2.pm index 4f163cde..81a1bae2 100644 --- a/lib/PublicInbox/Gcf2.pm +++ b/lib/PublicInbox/Gcf2.pm @@ -34,7 +34,7 @@ BEGIN { for my $k (@switches) { my $rd = popen_rd([$pc, "--$k", 'libgit2'], undef, $rdr); chomp(my $val = do { local $/; <$rd> }); - CORE::close($rd) or last; # checks for error and sets $? + $rd->close or last; # checks for error and sets $? $vals->{$k} = $val; } if (!$?) { diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index a1d52118..1f8ce1f0 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -441,12 +441,12 @@ sub qx { my $fh = popen(@_); if (wantarray) { my @ret = <$fh>; - CORE::close $fh; # caller should check $? + $fh->close; # caller should check $? @ret; } else { local $/; my $ret = <$fh>; - CORE::close $fh; # caller should check $? + $fh->close; # caller should check $? $ret; } } @@ -620,7 +620,7 @@ sub manifest_entry { } } $ent->{fingerprint} = sha_all(1, $sr)->hexdigest; - CORE::close $sr or return; # empty, uninitialized git repo + $sr->close or return; # empty, uninitialized git repo $ent->{modified} = modified(undef, $mod); chomp($buf = <$own> // ''); utf8::decode($buf); diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index edc88fe8..85991ae7 100644 --- a/lib/PublicInbox/HTTP.pm +++ b/lib/PublicInbox/HTTP.pm @@ -63,8 +63,8 @@ sub new ($$$) { my $ev = EPOLLIN; my $wbuf; if ($sock->can('accept_SSL') && !$sock->accept_SSL) { - return CORE::close($sock) if $! != EAGAIN; - $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock); + return $sock->close if $! != EAGAIN; + $ev = PublicInbox::TLS::epollbit() or return $sock->close; $wbuf = [ \&PublicInbox::DS::accept_tls_step ]; } $self->{wbuf} = $wbuf if $wbuf; diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 43e59e6c..49b38d43 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -59,7 +59,7 @@ sub try_scrape { my $opt = { 0 => $lei->{0}, 2 => $lei->{2} }; my $fh = popen_rd($cmd, undef, $opt); my $html = do { local $/; <$fh> } // die "read(curl $uri): $!"; - CORE::close($fh) or return $lei->child_error($?, "@$cmd failed"); + $fh->close or return $lei->child_error($?, "@$cmd failed"); # we grep with URL below, we don't want Subject/From headers # making us clone random URLs. This assumes remote instances @@ -335,7 +335,7 @@ sub fgrp_update { upr($lei, $w, 'create', $ref, $oid); } } - CORE::close($w) or upref_warn(); + $w->close or upref_warn(); } sub satellite_done { @@ -345,7 +345,7 @@ sub satellite_done { while (my ($ref, $oid) = each %$create) { upr($fgrp->{lei}, $w, 'create', $ref, $oid); } - CORE::close($w) or upref_warn(); + $w->close or upref_warn(); } else { pack_refs($fgrp, $fgrp->{cur_dst}); run_puh($fgrp);