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 DB0B71F87E for ; Fri, 27 Oct 2023 09:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1698399641; bh=DvioalwWiTKTqIJLOfFZfh5h6S0UcVM2N95zM7FjDlY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=V811g2CePnKsvAHwT1ooV7GMiSc1RPjbnzG16MKvNx9aJvhVhkRC1ValJfC7YrfP3 8SQhXTyfZl26R32g91JpkTg2kS3vuUSgrmMs3phQ9bha+VKTSo3DqsduPuMJDJL28a EEiex/j/1X43KVd8/IJzmbyp7Qygatuhm38XhLPE= From: Eric Wong To: spew@80x24.org Subject: [PATCH 13/18] import: use ->close for fast-import socket Date: Fri, 27 Oct 2023 09:40:34 +0000 Message-ID: <20231027094039.3788289-13-e@80x24.org> In-Reply-To: <20231027094039.3788289-1-e@80x24.org> References: <20231027094039.3788289-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --- 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) = @_;