From: David Turner <novalis@novalis.org>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, mhagger@alum.mit.edu,
David Turner <dturner@twosigma.com>
Subject: Re: [PATCH 2/2] fsck: handle bad trees like other errors
Date: Tue, 27 Sep 2016 11:19:34 -0400 [thread overview]
Message-ID: <1474989574.26902.7.camel@frank> (raw)
In-Reply-To: <20160927052754.bs4frcfy4y7fey62@sigill.intra.peff.net>
On Tue, 2016-09-27 at 01:27 -0400, Jeff King wrote:
> > -static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned long size)
> > +static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned long size, struct strbuf *err)
> > {
>
> I know we used the "err" strbuf pattern in the ref code, and it makes
> sense there where we have a lot of different functions with public
> interfaces. But here, we literally just feed the result to die() or
> warning(). I wonder if a nicer interface would be:
>
> typedef void (*err_fn)(const char *, ...);
>
> static int decode_tree_entry(struct tree_desc *desc,
> const char *buf, unsigned long size,
> err_fn err)
> {
> ...
> if (size < 23 || buf[size - 21]) {
> err("too-short tree object");
> return -1;
> }
> }
>
> I dunno. Maybe that is overengineering. I guess we only hit the strbufs
> in the error path (which used to die!), so nobody really cares that much
> about the extra allocation.
I don't really like err_fn because:
(a) without a baton, it's somewhat less general (or less thread-safe)
than the strbuf approach and
(b) with a baton, it's two arguments instead of one.
Thanks for all of the rest of the commentary; I've incorporated it and
will re-roll shortly.
next prev parent reply other threads:[~2016-09-27 15:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 19:32 [PATCH 0/2] tree-walk improvements David Turner
2016-09-26 19:32 ` [PATCH 1/2] tree-walk: be more specific about corrupt tree errors David Turner
2016-09-27 5:14 ` Jeff King
2016-09-27 5:35 ` Junio C Hamano
2016-09-27 15:21 ` David Turner
2016-09-26 19:32 ` [PATCH 2/2] fsck: handle bad trees like other errors David Turner
2016-09-26 19:51 ` Junio C Hamano
2016-09-26 20:08 ` Junio C Hamano
2016-09-26 20:11 ` Junio C Hamano
2016-09-27 5:27 ` Jeff King
2016-09-27 15:19 ` David Turner [this message]
2016-09-27 19:19 ` thoughts on error passing, was " Jeff King
2016-09-27 22:57 ` David Turner
2016-09-28 6:54 ` Jeff King
2016-09-28 5:01 ` Michael Haggerty
2016-09-28 8:58 ` Jeff King
2016-09-28 18:02 ` Junio C Hamano
2016-09-26 19:39 ` [PATCH 0/2] tree-walk improvements Stefan Beller
2016-09-26 19:43 ` Junio C Hamano
2016-09-26 20:22 ` David Turner
2016-09-27 0:35 ` Junio C Hamano
2016-09-26 21:04 ` Junio C Hamano
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=1474989574.26902.7.camel@frank \
--to=novalis@novalis.org \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/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 NNTP newsgroup(s).