Commit 86e9c9aa authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Florian Westphal
Browse files

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: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 0c805e80

lib/ts_bm.c

+30 −13
Original line number Diff line number Diff line
@@ -55,6 +55,24 @@ struct ts_bm 
	unsigned 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);
@@ -74,17 +92,16 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state) 
		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;



			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));

			}



next:			bs = bm->bad_shift[text[shift-i]];

			bs = bm->bad_shift[text[shift-i]];



			/* Now jumping to... */

			shift = max_t(int, shift-i+bs, shift+bm->good_shift[i]);