From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 13/18] import: use ->close for fast-import socket
Date: Fri, 27 Oct 2023 09:40:34 +0000 [thread overview]
Message-ID: <20231027094039.3788289-13-e@80x24.org> (raw)
In-Reply-To: <20231027094039.3788289-1-e@80x24.org>
---
lib/PublicInbox/Import.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 6eee8774..5e2e8a30 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -476,7 +476,7 @@ sub done {
my $io = delete $self->{io} or return;
eval {
print $io "done\n" or wfail;
- close $io; # reaps and dies on error
+ $io->close or croak "close fast-import \$?=$?"; # reaps
};
my $wait_err = $@;
my $nchg = delete $self->{nchg};
@@ -489,7 +489,7 @@ sub done {
die $wait_err if $wait_err;
}
-sub atfork_child { close(delete($_[0]->{io}) // return) }
+sub atfork_child { (delete($_[0]->{io}) // return)->close }
sub digest2mid ($$;$) {
my ($dig, $hdr, $fallback_time) = @_;
next prev parent reply other threads:[~2023-10-27 9:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 9:40 [PATCH 01/18] spawn: croak directly in C pi_fork_exec Eric Wong
2023-10-27 9:40 ` [PATCH 02/18] spawnpp: use autodie for syscall failures Eric Wong
2023-10-27 9:40 ` [PATCH 03/18] spawn: avoid alloca in C pi_fork_exec Eric Wong
2023-10-27 9:40 ` [PATCH 04/18] git: use run_qx to read `git --version' Eric Wong
2023-10-27 9:40 ` [PATCH 05/18] git: avoid extra stat(2) for git version Eric Wong
2023-10-27 9:40 ` [PATCH 06/18] import: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 07/18] treewide: use ->close method rather than CORE::close Eric Wong
2023-10-27 9:40 ` [PATCH 08/18] fetch: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 09/18] git_credential: use IO::Handle->close Eric Wong
2023-10-27 9:40 ` [PATCH 10/18] cindex: drop redundant close on regular FH Eric Wong
2023-10-27 9:40 ` [PATCH 11/18] admin: run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 12/18] config: use ->close for popen_rd pipe Eric Wong
2023-10-27 9:40 ` Eric Wong [this message]
2023-10-27 9:40 ` [PATCH 14/18] lei_mirror: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 15/18] lei_rediff: ->close for popen_wr Eric Wong
2023-10-27 9:40 ` [PATCH 16/18] spamcheck/spamc: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 17/18] lei_xsearch: use ->close Eric Wong
2023-10-27 9:40 ` [PATCH 18/18] searchidx: ->close Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231027094039.3788289-13-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).