Re: [PATCH 2/4] config: drop file pointer validity check in get_next_char()
- From
Heiko Voigt <hvoigt@hvoigt.net>
- Date
- Feb 27, 2013, 07:52 UTC
- Message-ID
- <20130227075257.GA4685@sandbox-ub>
- In-Reply-To
- <20130226200556.GB13830@sigill.intra.peff.net>
On Tue, Feb 26, 2013 at 03:05:56PM -0500, Jeff King wrote:
Show 14 quoted lines
> On Tue, Feb 26, 2013 at 08:40:23PM +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.
>
> Makes sense, although...
>
> > - if (cf && ((f = cf->f) != NULL)) {
> > + if (cf) {
> > + FILE *f = cf->f;
>
> Couldn't we say the same thing about "cf" here (i.e., that it would
> never be NULL)? Can we just get rid of this conditional entirely?That might be true. I will look into it. Just wanted to get rid of an extra callback in my series.
Cheers Heiko