From: Jeff King <peff@peff.net>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Jens Lehmann <jens.lehmann@web.de>,
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Subject: Re: [PATCH v2 2/4] config: drop file pointer validity check in get_next_char()
Date: Tue, 12 Mar 2013 07:00:03 -0400 [thread overview]
Message-ID: <20130312110003.GD11340@sigill.intra.peff.net> (raw)
In-Reply-To: <20130310165857.GC1136@sandbox-ub.fritz.box>
On Sun, Mar 10, 2013 at 05:58:57PM +0100, Heiko Voigt wrote:
> The only location where cf is set in this file is in do_config_from().
> This function has only one callsite which is config_from_file(). In
> config_from_file() its ensured that the f member is set to non-zero.
> [...]
> - if (cf && ((f = cf->f) != NULL)) {
> + if (cf) {
I still think we can drop this conditional entirely. The complete call
graph looks like:
git_config_from_file
-> git_parse_file
-> get_next_char
-> get_value
-> get_next_char
-> parse_value
-> get_next_char
-> get_base_var
-> get_next_char
-> get_extended_base_var
-> get_next_char
That is, every path to get_next_char happens while we are in
git_config_from_file, and that function guarantees that cf = &top, and
that top.f != NULL. We do not have to even do any analysis of the
conditions for each call, because we never change "cf" nor "top.f"
except when we set them in git_config_from_file.
-Peff
next prev parent reply other threads:[~2013-03-12 11:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-10 16:56 [PATCH v2 0/4] allow more sources for config values Heiko Voigt
2013-03-10 16:57 ` [PATCH v2 1/4] config: factor out config file stack management Heiko Voigt
2013-03-12 10:52 ` Jeff King
2013-03-12 15:44 ` Heiko Voigt
2013-03-12 19:04 ` Jeff King
2013-03-14 6:36 ` Heiko Voigt
2013-03-10 16:58 ` [PATCH v2 2/4] config: drop file pointer validity check in get_next_char() Heiko Voigt
2013-03-12 11:00 ` Jeff King [this message]
2013-03-12 16:00 ` Heiko Voigt
2013-03-12 16:16 ` Heiko Voigt
2013-03-12 19:26 ` Jeff King
2013-03-12 19:18 ` Jeff King
2013-03-10 16:59 ` [PATCH v2 3/4] config: make parsing stack struct independent from actual data source Heiko Voigt
2013-03-12 11:03 ` Jeff King
2013-03-12 16:27 ` Heiko Voigt
2013-03-12 19:27 ` Jeff King
2013-03-10 17:00 ` [PATCH v2 4/4] teach config parsing to read from strbuf Heiko Voigt
2013-03-12 11:18 ` Jeff King
2013-03-12 16:42 ` Heiko Voigt
2013-03-12 19:29 ` Jeff King
2013-03-14 6:39 ` Heiko Voigt
2013-03-14 7:10 ` Jeff King
2013-03-14 7:39 ` Jeff King
2013-03-18 14:18 ` Heiko Voigt
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=20130312110003.GD11340@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jens.lehmann@web.de \
--cc=ramsay@ramsay1.demon.co.uk \
/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).