From: karthik nayak <karthik.188@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, sunshine@sunshineco.com
Subject: Re: [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type
Date: Thu, 26 Mar 2015 01:52:31 +0530 [thread overview]
Message-ID: <55131907.8@gmail.com> (raw)
In-Reply-To: <xmqqvbho27ym.fsf@gitster.dls.corp.google.com>
On 03/26/2015 12:57 AM, Junio C Hamano wrote:
> Karthik Nayak <karthik.188@gmail.com> writes:
>
>> +static int unpack_sha1_header_to_strbuf(git_zstream *stream, unsigned char *map,
>> + unsigned long mapsize,
>> + struct strbuf *header)
>> +{
>> + unsigned char buffer[32], *cp;
>> + unsigned long bufsiz = sizeof(buffer);
>> + int status;
>> +
>> + status = unpack_sha1_header(stream, map, mapsize, buffer, bufsiz);
>> +
>> + if (status) {
>> + strbuf_add(header, buffer, stream->next_out - buffer);
>> + return status;
>> + }
>> +
>> + do {
>> + status = git_inflate(stream, 0);
>> + strbuf_add(header, buffer, stream->next_out - buffer);
>> + for (cp = buffer; cp < stream->next_out; cp++)
>> + if (!*cp)
>> + /* Found the NUL at the end of the header */
>> + return 0;
>> + stream->next_out = buffer;
>> + stream->avail_out = bufsiz;
>> + } while (status == Z_OK);
>> + return -1;
>
> A caller of unpack_sha1_header() gets the return from git_inflate();
> I wonder if we should be returning "status" here for consistency,
> perhaps?
>
Although the caller only checks for negative values for failure. For
consistency it would be better to return status as unpack_sha1_header()
does.
next prev parent reply other threads:[~2015-03-25 20:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-25 7:19 [PATCH v5 0/2] cat-file: add a '--literally' option karthik nayak
2015-03-25 7:21 ` [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type Karthik Nayak
2015-03-25 19:13 ` Junio C Hamano
2015-03-25 20:20 ` karthik nayak
2015-03-25 20:32 ` Junio C Hamano
2015-03-25 19:27 ` Junio C Hamano
2015-03-25 20:22 ` karthik nayak [this message]
2015-03-25 7:22 ` [PATCH v5 2/2] cat-file: teach cat-file a '--literally' option Karthik Nayak
2015-03-25 7:42 ` Eric Sunshine
2015-03-25 7:48 ` karthik nayak
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=55131907.8@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/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).