From: Heiko Voigt <hvoigt@hvoigt.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jens Lehmann <jens.lehmann@web.de>,
Jeff King <peff@peff.net>,
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Subject: [PATCH v2 2/4] config: drop file pointer validity check in get_next_char()
Date: Sun, 10 Mar 2013 17:58:57 +0100 [thread overview]
Message-ID: <20130310165857.GC1136@sandbox-ub.fritz.box> (raw)
In-Reply-To: <20130310165642.GA1136@sandbox-ub.fritz.box>
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.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
config.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index 2c299dc..f55c43d 100644
--- a/config.c
+++ b/config.c
@@ -169,10 +169,10 @@ int git_config_from_parameters(config_fn_t fn, void *data)
static int get_next_char(void)
{
int c;
- FILE *f;
c = '\n';
- if (cf && ((f = cf->f) != NULL)) {
+ if (cf) {
+ FILE *f = cf->f;
c = fgetc(f);
if (c == '\r') {
/* DOS like systems */
--
1.8.2.rc0.26.gf7384c5
next prev parent reply other threads:[~2013-03-10 16:59 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 ` Heiko Voigt [this message]
2013-03-12 11:00 ` [PATCH v2 2/4] config: drop file pointer validity check in get_next_char() Jeff King
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=20130310165857.GC1136@sandbox-ub.fritz.box \
--to=hvoigt@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jens.lehmann@web.de \
--cc=peff@peff.net \
--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).