From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
William Duclot <william.duclot@ensimag.grenoble-inp.fr>,
git@vger.kernel.org, antoine.queru@ensimag.grenoble-inp.fr,
francois.beutin@ensimag.grenoble-inp.fr,
Johannes.Schindelin@gmx.de, mh@glandium.org
Subject: Re: [PATCH] send-pack: use buffered I/O to talk to pack-objects
Date: Thu, 09 Jun 2016 19:22:21 +0200 [thread overview]
Message-ID: <vpqeg86cm5u.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqr3c6iad1.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Thu, 09 Jun 2016 09:40:42 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> Jeff King <peff@peff.net> writes:
>>
>>> --- a/send-pack.c
>>> +++ b/send-pack.c
>>> @@ -36,18 +36,15 @@ int option_parse_push_signed(const struct option *opt,
>>> die("bad %s argument: %s", opt->long_name, arg);
>>> }
>>>
>>> -static int feed_object(const unsigned char *sha1, int fd, int negative)
>>> +static void feed_object(const unsigned char *sha1, FILE *fh, int negative)
>>> {
>>> - char buf[42];
>>> -
>>> if (negative && !has_sha1_file(sha1))
>>> - return 1;
>>> + return;
>> [...]
>>> @@ -97,21 +95,22 @@ static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, stru
>> [...]
>>> for (i = 0; i < extra->nr; i++)
>>> - if (!feed_object(extra->sha1[i], po.in, 1))
>>> - break;
>>> + feed_object(extra->sha1[i], po_in, 1);
>>
>> I may have missed the obvious, but doesn't this change the behavior when
>> "negative && !has_sha1_file(sha1)" happens? I understand that you don't
>> need write_or_whine anymore, but don't understand how you get rid of the
>> "return 1" here.
>
> The original feed_object() has somewhat strange interface in that a
> non-zero return from it is "Everything went alright!", and zero
> means "Oops, something went wrong".
Indeed, this is the "obvious" I've missed. So, indeed, the new "return"
does the same thing as the old "return 1".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2016-06-09 17:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 15:13 [PATCH V2 0/3] strbuf: improve API William Duclot
2016-06-06 15:13 ` [PATCH V2 1/3] strbuf: add tests William Duclot
2016-06-06 16:11 ` Matthieu Moy
2016-06-07 8:44 ` Johannes Schindelin
2016-06-06 15:13 ` [PATCH V2 2/3] pretty.c: rename strbuf_wrap() function William Duclot
2016-06-06 16:12 ` Matthieu Moy
2016-06-07 9:04 ` Johannes Schindelin
2016-06-06 15:13 ` [PATCH V2 3/3] strbuf: allow to use preallocated memory William Duclot
2016-06-06 16:17 ` Matthieu Moy
2016-06-06 17:19 ` Junio C Hamano
2016-06-06 20:39 ` William Duclot
2016-06-06 22:44 ` Junio C Hamano
2016-06-06 22:58 ` Jeff King
2016-06-06 23:24 ` Junio C Hamano
2016-06-06 23:25 ` Junio C Hamano
2016-06-06 23:30 ` Jeff King
2016-06-07 9:06 ` William Duclot
2016-06-07 18:10 ` Junio C Hamano
2016-06-08 16:20 ` Michael Haggerty
2016-06-08 18:07 ` Junio C Hamano
2016-06-08 19:19 ` Jeff King
2016-06-08 19:42 ` [PATCH] send-pack: use buffered I/O to talk to pack-objects Jeff King
2016-06-09 12:10 ` Matthieu Moy
2016-06-09 14:34 ` Ramsay Jones
2016-06-09 17:12 ` Jeff King
2016-06-09 22:40 ` Ramsay Jones
2016-06-09 16:40 ` Junio C Hamano
2016-06-09 17:14 ` Jeff King
2016-06-09 17:22 ` Matthieu Moy [this message]
2016-06-08 19:48 ` [PATCH V2 3/3] strbuf: allow to use preallocated memory Junio C Hamano
2016-06-08 19:52 ` Jeff King
2016-06-08 23:05 ` 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
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=vpqeg86cm5u.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=antoine.queru@ensimag.grenoble-inp.fr \
--cc=francois.beutin@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mh@glandium.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=william.duclot@ensimag.grenoble-inp.fr \
/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).