dovecot-2.2: lib-fts: Minor code cleanup - avoid functions alway...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/fa55a06ffae2
changeset: 18609:fa55a06ffae2
user:      Timo Sirainen <tss at iki.fi>
date:      Sat May 09 19:21:45 2015 +0300
description:
lib-fts: Minor code cleanup - avoid functions always returning same value
Makes it clearer to see in the code that the function can't return any
failures.

diffstat:

 src/lib-fts/fts-tokenizer-address.c |  18 ++++++++++--------
 src/lib-fts/fts-tokenizer-generic.c |  22 ++++++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diffs (141 lines):

diff -r 1fc7ae2640b0 -r fa55a06ffae2 src/lib-fts/fts-tokenizer-address.c
--- a/src/lib-fts/fts-tokenizer-address.c	Sat May 09 19:14:07 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-address.c	Sat May 09 19:21:45 2015 +0300
@@ -63,14 +63,13 @@
 	i_free(tok);
 }
 
-static int
+static void
 fts_tokenizer_address_current_token(struct email_address_fts_tokenizer *tok,
                                     const char **token_r)
 {
 	tok->tokenizer.skip_parents = TRUE;
 	tok->state = EMAIL_ADDRESS_PARSER_STATE_NONE;
 	*token_r = t_strdup(str_c(tok->last_word));
-	return 1;
 }
 
 static bool
@@ -215,7 +214,8 @@
 
 	if (tok->state == EMAIL_ADDRESS_PARSER_STATE_COMPLETE) {
 		*skip_r = pos;
-		return fts_tokenizer_address_current_token(tok, token_r);
+		fts_tokenizer_address_current_token(tok, token_r);
+		return 1;
 	}
 
 	/* end of data, output lingering tokens. first the parents data, then
@@ -231,8 +231,10 @@
 		if (fts_tokenizer_address_parent_data(tok, token_r))
 			return 1;
 
-		if (tok->state == EMAIL_ADDRESS_PARSER_STATE_DOMAIN)
-			return fts_tokenizer_address_current_token(tok, token_r);
+		if (tok->state == EMAIL_ADDRESS_PARSER_STATE_DOMAIN) {
+			fts_tokenizer_address_current_token(tok, token_r);
+			return 1;
+		}
 		tok->state = EMAIL_ADDRESS_PARSER_STATE_NONE;
 	}
 
@@ -279,9 +281,9 @@
 			break;
 		case EMAIL_ADDRESS_PARSER_STATE_COMPLETE:
 			*skip_r = pos;
-			if (fts_tokenizer_address_parent_data(tok, token_r))
-				return 1;
-			return fts_tokenizer_address_current_token(tok, token_r);
+			if (!fts_tokenizer_address_parent_data(tok, token_r))
+				fts_tokenizer_address_current_token(tok, token_r);
+			return 1;
 		default:
 			i_unreached();
 		}
diff -r 1fc7ae2640b0 -r fa55a06ffae2 src/lib-fts/fts-tokenizer-generic.c
--- a/src/lib-fts/fts-tokenizer-generic.c	Sat May 09 19:14:07 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-generic.c	Sat May 09 19:21:45 2015 +0300
@@ -94,13 +94,12 @@
 	return t_strndup(data, pos);
 }
 
-static int
+static void
 fts_tokenizer_generic_simple_current_token(struct generic_fts_tokenizer *tok,
                                            const char **token_r)
 {
 	*token_r = fts_uni_strndup(tok->token->data, tok->token->used);
 	buffer_set_used_size(tok->token, 0);
-	return 1;
 }
 
 /* TODO: This is duplicated from unichar.c */
@@ -187,7 +186,8 @@
 			}
 			/* word boundary found - return a new token */
 			*skip_r = i + 1;
-			return fts_tokenizer_generic_simple_current_token(tok, token_r);
+			fts_tokenizer_generic_simple_current_token(tok, token_r);
+			return 1;
 		}
 	}
 	/* word boundary not found yet */
@@ -196,8 +196,10 @@
 	*skip_r = i;
 
 	/* return the last token */
-	if (size == 0 && tok->token->used > 0)
-		return fts_tokenizer_generic_simple_current_token(tok, token_r);
+	if (size == 0 && tok->token->used > 0) {
+		fts_tokenizer_generic_simple_current_token(tok, token_r);
+		return 1;
+	}
 	return 0;
 }
 
@@ -492,7 +494,7 @@
 
 	return FALSE;
 }
-static int
+static void
 fts_tokenizer_generic_tr29_current_token(struct generic_fts_tokenizer *tok,
                                          const char **token_r)
 {
@@ -508,7 +510,6 @@
 	buffer_set_used_size(tok->token, 0);
 	tok->prev_prev_letter = LETTER_TYPE_NONE;
 	tok->prev_letter = LETTER_TYPE_NONE;
-	return 1;
 }
 
 struct letter_fn {
@@ -569,7 +570,6 @@
 {
 	struct generic_fts_tokenizer *tok =
 		(struct generic_fts_tokenizer *)_tok;
-
 	unichar_t c;
 	size_t i, char_start_i, start_skip = 0;
 	enum letter_type lt;
@@ -592,7 +592,8 @@
 			tok_append_truncated(tok, data + start_skip,
 					     char_start_i - start_skip);
 			*skip_r = i + 1;
-			return fts_tokenizer_generic_tr29_current_token(tok, token_r);
+			fts_tokenizer_generic_tr29_current_token(tok, token_r);
+			return 1;
 		}
 	}
 	i_assert(i >= start_skip && size >= start_skip);
@@ -602,7 +603,8 @@
 	if (size == 0 && tok->token->used > 0) {
 		/* return the last token */
 		*skip_r = 0;
-		return fts_tokenizer_generic_tr29_current_token(tok, token_r);
+		fts_tokenizer_generic_tr29_current_token(tok, token_r);
+		return 1;
 	}
 	return 0;
 }