dovecot-2.2: lib-fts: simple tokenizer cleanup - removed unneces...

dovecot at dovecot.org dovecot at dovecot.org
Mon Jun 1 18:32:01 UTC 2015


details:   http://hg.dovecot.org/dovecot-2.2/rev/b239f075147b
changeset: 18773:b239f075147b
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jun 01 21:19:47 2015 +0300
description:
lib-fts: simple tokenizer cleanup - removed unnecessary variables

diffstat:

 src/lib-fts/fts-tokenizer-generic.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 62b201a1ee06 -r b239f075147b src/lib-fts/fts-tokenizer-generic.c
--- a/src/lib-fts/fts-tokenizer-generic.c	Mon Jun 01 21:16:35 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-generic.c	Mon Jun 01 21:19:47 2015 +0300
@@ -220,19 +220,17 @@
 {
 	struct generic_fts_tokenizer *tok =
 		(struct generic_fts_tokenizer *)_tok;
-	size_t i, char_start_i, len, start = 0;
+	size_t i, start = 0;
 	unsigned int char_size;
 	unichar_t c;
 
 	for (i = 0; i < size; i += char_size) {
-		char_start_i = i;
 		if (uni_utf8_get_char_n(data + i, size - i, &c) <= 0)
 			i_unreached();
 		char_size = uni_utf8_char_bytes(data[i]);
 		if (fts_ascii_word_break(data[i]) || fts_uni_word_break(c) ||
 		    fts_apostrophe_word_break(tok, c)) {
-			len = char_start_i - start;
-			tok_append_truncated(tok, data + start, len);
+			tok_append_truncated(tok, data + start, i - start);
 			if (tok->token->used > 0 &&
 			    fts_tokenizer_generic_simple_current_token(tok, token_r)) {
 				*skip_r = i + char_size;
@@ -242,8 +240,7 @@
 		}
 	}
 	/* word boundary not found yet */
-	len = i - start;
-	tok_append_truncated(tok, data + start, len);
+	tok_append_truncated(tok, data + start, i - start);
 	*skip_r = i;
 
 	/* return the last token */


More information about the dovecot-cvs mailing list