Re: [PATCH v6 02/11] grep: break down an "if" stmt in preparation for next changes
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 9, 2016, 18:20 UTC
- Message-ID
- <xmqqd1s54ugb.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1454724190-14063-3-git-send-email-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
Show 21 quoted lines
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> grep.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/grep.c b/grep.c
> index 7b2b96a..e739d20 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -403,9 +403,11 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
> p->word_regexp = opt->word_regexp;
> p->ignore_case = opt->ignore_case;
>
> - if (opt->fixed || is_fixed(p->pattern, p->patternlen))
> + if (is_fixed(p->pattern, p->patternlen))
> p->fixed = 1;
> - else
> + else if (opt->fixed) {
> + p->fixed = 1;
> + } else
> p->fixed = 0;The original used to check inexpensive one first and then more expensive one. The updated one gets it backwards.
Is that intended?
>
> if (p->fixed) {