lib-fts/fts-tokeniser-generic: move to container_of() for type-safety

Signed-off-by: Phil Carmody <phil@dovecot.fi>

diff --git a/src/lib-fts/fts-tokenizer-generic.c b/src/lib-fts/fts-tokenizer-generic.c
index 2130358ff936e438565e3292fdd01f4fe84ac667..8e282138e6f5e97d078228a53e25b0b9f6652c30 100644 (file)
--- a/src/lib-fts/fts-tokenizer-generic.c
+++ b/src/lib-fts/fts-tokenizer-generic.c
@@ -95,7 +95,7 @@ static void
 fts_tokenizer_generic_destroy(struct fts_tokenizer *_tok)
 {
        struct generic_fts_tokenizer *tok =
-               (struct generic_fts_tokenizer *)_tok;
+               container_of(_tok, struct generic_fts_tokenizer, tokenizer);
 
        buffer_free(&tok->token);
        i_free(tok);
@@ -176,7 +176,7 @@ fts_simple_is_word_break(struct generic_fts_tokenizer *tok,
 static void fts_tokenizer_generic_reset(struct fts_tokenizer *_tok)
 {
        struct generic_fts_tokenizer *tok =
-               (struct generic_fts_tokenizer *)_tok;
+               container_of(_tok, struct generic_fts_tokenizer, tokenizer);
 
        tok->prev_letter = LETTER_TYPE_NONE;
        tok->prev_prev_letter = LETTER_TYPE_NONE;
@@ -199,7 +199,7 @@ fts_tokenizer_generic_simple_next(struct fts_tokenizer *_tok,
                                  const char **error_r ATTR_UNUSED)
 {
        struct generic_fts_tokenizer *tok =
-               (struct generic_fts_tokenizer *)_tok;
+               container_of(_tok, struct generic_fts_tokenizer, tokenizer);
        size_t i, start = 0;
        int char_size;
        unichar_t c;
@@ -653,7 +653,7 @@ fts_tokenizer_generic_tr29_next(struct fts_tokenizer *_tok,
                                const char **error_r ATTR_UNUSED)
 {
        struct generic_fts_tokenizer *tok =
-               (struct generic_fts_tokenizer *)_tok;
+               container_of(_tok, struct generic_fts_tokenizer, tokenizer);
        unichar_t c;
        size_t i, char_start_i, start_pos = 0;
        enum letter_type lt;