From: "René Scharfe" <l.s.r@web.de>
To: Christian Couder <christian.couder@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Chris Torek <chris.torek@gmail.com>, Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH v2] upload-pack: use buffered I/O to talk to rev-list
Date: Thu, 13 Aug 2020 07:57:20 +0200 [thread overview]
Message-ID: <866055fd-7857-3eb3-6dae-befc8f891994@web.de> (raw)
In-Reply-To: <CAP8UFD1rDZOQSDWhc+xdEQVX+Umq-nE-sd-orgKZ3UWTWFHJhw@mail.gmail.com>
Am 13.08.20 um 07:17 schrieb Christian Couder:
> On Wed, Aug 12, 2020 at 6:54 PM René Scharfe <l.s.r@web.de> wrote:
>
>> - close(cmd->in);
>> + if (ferror(cmd_in) || fflush(cmd_in))
>> + goto error;
>> + fclose(cmd_in);
>> cmd->in = -1;
>
> I wonder if setting cmd->in to -1 is still useful...
The patch doesn't change its usefulness. It probably was not necessary
to begin with.
>
>> sigchain_pop(SIGPIPE);
>>
The next line right here (not shown in the diff) returns 0.
>> @@ -660,8 +658,8 @@ static int do_reachable_revlist(struct child_process *cmd,
>> error:
>> sigchain_pop(SIGPIPE);
>>
>> - if (cmd->in >= 0)
>> - close(cmd->in);
>> + if (cmd_in)
>> + fclose(cmd_in);
>
> ...as we don't check cmd->in anymore at the end of the function, but
> we now check cmd_in instead. So should cmd_in have been set to -1
> instead of cmd->in?
This error handler is not reached from the place that sets cmd->in back
to -1. It can be reached from a place where cmd_in is still NULL, so
this check is necessary and setting cmd_in to NULL above is not needed.
René
next prev parent reply other threads:[~2020-08-13 6:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-02 14:38 [PATCH] upload-pack: use buffered I/O to talk to rev-list René Scharfe
2020-08-02 16:03 ` Chris Torek
2020-08-03 14:00 ` René Scharfe
2020-08-03 15:54 ` Chris Torek
2020-08-03 18:15 ` Johannes Sixt
2020-08-12 16:52 ` [PATCH v2] " René Scharfe
2020-08-13 5:17 ` Christian Couder
2020-08-13 5:57 ` René Scharfe [this message]
2020-08-13 9:01 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=866055fd-7857-3eb3-6dae-befc8f891994@web.de \
--to=l.s.r@web.de \
--cc=chris.torek@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).