From 65fa1e31c0da8dc26f872c050e81b649dc65a32b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 14 Jul 2016 19:38:01 +0200 Subject: grep: minor style changes for -F crash fix * src/kwset.c (memoff2_kwset): Use ?: instead of if-else. --- src/kwset.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/kwset.c') diff --git a/src/kwset.c b/src/kwset.c index 80df752d..264ef22e 100644 --- a/src/kwset.c +++ b/src/kwset.c @@ -643,13 +643,9 @@ memoff2_kwset (char const *s, size_t n, kwset_t kwset, { struct tree const *link = kwset->trie->links; struct tree const *clink = link->llink ? link->llink : link->rlink; - char const *mch; - - if (clink) - mch = memchr2 (s, link->label, clink->label, n); - else - mch = memchr (s, link->label, n); - + char const *mch = (clink + ? memchr2 (s, link->label, clink->label, n) + : memchr (s, link->label, n)); if (! mch) return SIZE_MAX; else -- cgit v1.2.1