From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] read-cache: fix an -Wmaybe-uninitialized warning
Date: Tue, 20 Mar 2018 22:52:16 +0000 [thread overview]
Message-ID: <e3894650-3639-c871-1291-f3efa7fbea0a@ramsayjones.plus.com> (raw)
In-Reply-To: <20180320043652.GC13302@sigill.intra.peff.net>
On 20/03/18 04:36, Jeff King wrote:
> On Mon, Mar 19, 2018 at 05:56:11PM +0000, Ramsay Jones wrote:
>
[snip]
>> diff --git a/read-cache.c b/read-cache.c
>> index 2eb81a66b..49607ddcd 100644
>> --- a/read-cache.c
>> +++ b/read-cache.c
>> @@ -2104,13 +2104,15 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
>> struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
>> {
>> int size;
>> - int saved_namelen = saved_namelen; /* compiler workaround */
>> int result;
>> + unsigned int saved_namelen;
>> + int stripped_name = 0;
>
> Maybe too clever, but I think you could just do:
>
> unsigned int saved_namelen = 0;
> ...
> saved_namelen = ce_namelen(ce);
> ...
> if (saved_namelen)
> ce->ce_namelen = saved_namelen;
> ce->ce_flags &= ~CE_STRIP_NAME;
>
> the zero-length name case (if that's even legal) would work out the
> same.
Yeah, that was one option that I looked at. The first option
was to initialise saved_namelen to -1 (it was still an int) then
the test became if (saved_namelen >= 0). However, that started
me thinking about the zero-length case - should I assert if
((ce->ce_flags & CE_STRIP_NAME) && (ce_namelen(ce) == 0))? etc.
In the end, I decided that I wanted it to be 'drop dead' obvious
what was going on! Hopefully, the result was just that. :-D
ATB,
Ramsay Jones
next prev parent reply other threads:[~2018-03-20 22:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 17:56 [PATCH 2/2] read-cache: fix an -Wmaybe-uninitialized warning Ramsay Jones
2018-03-20 4:36 ` Jeff King
2018-03-20 22:52 ` Ramsay Jones [this message]
2018-03-21 5:59 ` 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=e3894650-3639-c871-1291-f3efa7fbea0a@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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).