dovecot-2.2: lib-fts: fts-tokenizer-generic-private.h had conten...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/00240870d0bd
changeset: 18592:00240870d0bd
user:      Timo Sirainen <tss at iki.fi>
date:      Sat May 09 15:06:45 2015 +0300
description:
lib-fts: fts-tokenizer-generic-private.h had content that didn't really belog there.

diffstat:

 src/lib-fts/fts-tokenizer-generic-private.h |  29 -----------------------------
 src/lib-fts/fts-tokenizer-generic.c         |  15 +++++++++++++++
 2 files changed, 15 insertions(+), 29 deletions(-)

diffs (62 lines):

diff -r e2a0b43e73ef -r 00240870d0bd src/lib-fts/fts-tokenizer-generic-private.h
--- a/src/lib-fts/fts-tokenizer-generic-private.h	Sat May 09 15:00:28 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-generic-private.h	Sat May 09 15:06:45 2015 +0300
@@ -48,33 +48,4 @@
 	buffer_t *token;
 };
 
-static bool letter_panic(struct generic_fts_tokenizer *tok);
-static bool letter_cr_lf_newline(struct generic_fts_tokenizer *tok);
-static bool letter_extend_format(struct generic_fts_tokenizer *tok);
-static bool letter_regional_indicator(struct generic_fts_tokenizer *tok);
-static bool letter_katakana(struct generic_fts_tokenizer *tok);
-static bool letter_hebrew(struct generic_fts_tokenizer *tok);
-static bool letter_aletter(struct generic_fts_tokenizer *tok);
-static bool letter_single_quote(struct generic_fts_tokenizer *tok);
-static bool letter_double_quote(struct generic_fts_tokenizer *tok);
-static bool letter_midnumlet(struct generic_fts_tokenizer *tok);
-static bool letter_midletter(struct generic_fts_tokenizer *tok);
-static bool letter_midnum(struct generic_fts_tokenizer *tok);
-static bool letter_numeric(struct generic_fts_tokenizer *tok);
-static bool letter_extendnumlet(struct generic_fts_tokenizer *tok);
-static bool letter_other(struct generic_fts_tokenizer *tok);
-
-struct letter_fn {
-	bool (*fn)(struct generic_fts_tokenizer *tok);
-};
-struct letter_fn letter_fns[] = {
-	{letter_panic}, {letter_cr_lf_newline}, {letter_cr_lf_newline},
-	{letter_cr_lf_newline}, {letter_extend_format},
-	{letter_regional_indicator}, {letter_extend_format},
-	{letter_katakana}, {letter_hebrew}, {letter_aletter},
-	{letter_single_quote}, {letter_double_quote},
-	{letter_midnumlet}, {letter_midletter}, {letter_midnum},
-	{letter_numeric}, {letter_extendnumlet}, {letter_panic},
-	{letter_panic}, {letter_other}
-};
 #endif
diff -r e2a0b43e73ef -r 00240870d0bd src/lib-fts/fts-tokenizer-generic.c
--- a/src/lib-fts/fts-tokenizer-generic.c	Sat May 09 15:00:28 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-generic.c	Sat May 09 15:06:45 2015 +0300
@@ -496,6 +496,21 @@
 	tok->prev_letter = LETTER_TYPE_NONE;
 	return 1;
 }
+
+struct letter_fn {
+	bool (*fn)(struct generic_fts_tokenizer *tok);
+};
+static struct letter_fn letter_fns[] = {
+	{letter_panic}, {letter_cr_lf_newline}, {letter_cr_lf_newline},
+	{letter_cr_lf_newline}, {letter_extend_format},
+	{letter_regional_indicator}, {letter_extend_format},
+	{letter_katakana}, {letter_hebrew}, {letter_aletter},
+	{letter_single_quote}, {letter_double_quote},
+	{letter_midnumlet}, {letter_midletter}, {letter_midnum},
+	{letter_numeric}, {letter_extendnumlet}, {letter_panic},
+	{letter_panic}, {letter_other}
+};
+
 /*
   Find word boundaries in input text. Based on Unicode standard annex
   #29, but tailored for FTS purposes.