From: Phil Carmody <phil@dovecot.fi>
Date: Thu, 26 Apr 2018 13:57:11 +0000 (+0300)
Subject: lib-fts/fts-tokeniser-generic: move to container_of() for type-safety
X-Git-Tag: 2.3.9~1287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cb8678634b6567304c4f24e462974a78529fb7c;p=thirdparty%2Fdovecot%2Fcore.git

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 2130358ff9..8e282138e6 100644
--- 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;