lib/ts_bm: add helper to reduce indentation and improve readability
Subsystems (2)
PATCH v2 1/1 lib/ts_bm: add helper to reduce indentation and improve readability
The flow-control of bm_find is very deeply nested with a conditional comparing a ternary expression against the pattern inside a for-loop inside a while-loop inside a for-loop.
Move the inner for-loop into a helper function to reduce the amount of indentation and make the code easier to read.
Fix indentation and trailing white-space in preceding debug logging statement.
Signed-off-by Jeremy Sowden <[email protected]>
---
Changes since v1
* Update i in bm_find
* Mention white-space changes for DEBUGP statement
lib/ts_bm.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-)
lib/ts_bm.c +30 -13
@@ -55,6 +55,24 @@ struct ts_bmunsigned int good_shift[]; }; +static unsigned int matchpat (const u8 *pattern,unsigned int patlen, +const u8 *text,bool icase) +{ +unsigned int i; + +for (i =0 ; i < patlen; i++) { +u8 t = *(text-i); + +if (icase) + t =toupper (t); + +if (t != *(pattern-i)) +break ; + } + +return i; +} +static unsigned int bm_find (struct ts_config *conf,struct ts_state *state) {struct ts_bm *bm =ts_config_priv (conf);
@@ -70,19 +88,18 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state)break ;while (shift < text_len) { -DEBUGP ("Searching in position %d (%c)\n" , - shift, text[shift]); -for (i =0 ; i < bm->patlen; i++) -if ((icase ?toupper (text[shift-i]) - : text[shift-i]) - != bm->pattern[bm->patlen-1 -i]) - goto next; - -/* London calling... */ -DEBUGP ("found!\n" ); -return consumed + (shift-(bm->patlen-1 )); - -next: bs = bm->bad_shift[text[shift-i]]; +DEBUGP ("Searching in position %d (%c)\n" , + shift, text[shift]); + + i =matchpat (&bm->pattern[bm->patlen-1 ], bm->patlen, + &text[shift], icase); +if (i == bm->patlen) { +/* London calling... */ +DEBUGP ("found!\n" ); +return consumed + (shift-(bm->patlen-1 )); + } + + bs = bm->bad_shift[text[shift-i]];/* Now jumping to... */ shift =max_t (int, shift-i+bs, shift+bm->good_shift[i]);
Signature · 1 line
2.40.1