From: Chris Torek <chris.torek@gmail.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] midx: use buffered I/O to talk to pack-objects
Date: Sun, 2 Aug 2020 09:11:17 -0700 [thread overview]
Message-ID: <CAPx1GveChRzsA=FayzhZRSQLPz+o1Po3-_9ZvAGLPztpH5Jg9w@mail.gmail.com> (raw)
In-Reply-To: <c5920e08-b7dd-e870-f99e-225d0aafc663@web.de>
On Sun, Aug 2, 2020 at 7:40 AM René Scharfe <l.s.r@web.de> wrote:
> @@ -1443,10 +1446,15 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
> continue;
>
> nth_midxed_object_oid(&oid, m, i);
> - xwrite(cmd.in, oid_to_hex(&oid), the_hash_algo->hexsz);
> - xwrite(cmd.in, "\n", 1);
> + fprintf(cmd_in, "%s\n", oid_to_hex(&oid));
> + }
> +
> + if (fclose(cmd_in)) {
> + error_errno(_("could not close stdin of pack-objects"));
> + result = 1;
> + finish_command(&cmd);
> + goto cleanup;
> }
> - close(cmd.in);
>
> if (finish_command(&cmd)) {
> error(_("could not finish pack-objects"));
> --
> 2.28.0
Here, we don't have any explicit errno checking, but
of course error_errno() uses errno. This too needs
an ferror() (or fflush()) test before the final fclose(),
and then we just need to use plain error(). Otherwise
you'll need the clumsier test-after-each-fprintf() and
an explicit final fflush()-and-test.
Chris
next prev parent reply other threads:[~2020-08-02 16:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-02 14:38 [PATCH] midx: use buffered I/O to talk to pack-objects René Scharfe
2020-08-02 16:11 ` Chris Torek [this message]
2020-08-03 18:10 ` Johannes Sixt
2020-08-03 22:27 ` René Scharfe
2020-08-04 4:31 ` René Scharfe
2020-08-04 4:37 ` Junio C Hamano
2020-08-03 12:39 ` Derrick Stolee
2020-08-11 16:08 ` René Scharfe
2020-08-11 17:14 ` Derrick Stolee
2020-08-12 16:52 ` [PATCH v2] " René Scharfe
2020-08-12 20:28 ` Junio C Hamano
2020-08-12 20:31 ` Junio C Hamano
2020-08-13 9:11 ` Jeff King
2020-08-13 9:06 ` 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='CAPx1GveChRzsA=FayzhZRSQLPz+o1Po3-_9ZvAGLPztpH5Jg9w@mail.gmail.com' \
--to=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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).