From: Timo Sirainen <tss@iki.fi>
Date: Mon, 1 Jun 2015 18:49:18 +0000 (+0300)
Subject: lib-fts: tr29 tokenizer - rename variable in preparation for the next patch
X-Git-Tag: 2.2.19.rc1~415
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67360bc4d7c3fbcedcf7364ea2290406c8e0d082;p=thirdparty%2Fdovecot%2Fcore.git

lib-fts: tr29 tokenizer - rename variable in preparation for the next patch
---

diff --git a/src/lib-fts/fts-tokenizer-generic.c b/src/lib-fts/fts-tokenizer-generic.c
index 78c850e6ff..8e942c3079 100644
--- a/src/lib-fts/fts-tokenizer-generic.c
+++ b/src/lib-fts/fts-tokenizer-generic.c
@@ -631,7 +631,7 @@ fts_tokenizer_generic_next_tr29(struct fts_tokenizer *_tok,
 	struct generic_fts_tokenizer *tok =
 		(struct generic_fts_tokenizer *)_tok;
 	unichar_t c;
-	size_t i, char_start_i, start_skip = 0;
+	size_t i, char_start_i, start_pos = 0;
 	enum letter_type lt;
 
 	/* TODO: Process 8bit chars separately, to speed things up. */
@@ -644,20 +644,20 @@ fts_tokenizer_generic_next_tr29(struct fts_tokenizer *_tok,
 		if (tok->prev_letter == LETTER_TYPE_NONE && is_nontoken(lt)) {
 			/* Skip non-token chars at the beginning of token */
 			i_assert(tok->token->used == 0);
-			start_skip = i;
+			start_pos = i;
 			continue;
 		}
 		if (uni_found_word_boundary(tok, lt)) {
-			i_assert(char_start_i >= start_skip && size >= start_skip);
-			tok_append_truncated(tok, data + start_skip,
-					     char_start_i - start_skip);
+			i_assert(char_start_i >= start_pos && size >= start_pos);
+			tok_append_truncated(tok, data + start_pos,
+					     char_start_i - start_pos);
 			*skip_r = i;
 			fts_tokenizer_generic_tr29_current_token(tok, token_r);
 			return 1;
 		}
 	}
-	i_assert(i >= start_skip && size >= start_skip);
-	tok_append_truncated(tok, data + start_skip, i - start_skip);
+	i_assert(i >= start_pos && size >= start_pos);
+	tok_append_truncated(tok, data + start_pos, i - start_pos);
 	*skip_r = i;
 
 	if (size == 0 && tok->token->used > 0) {