dovecot-2.2: lib-fts: Minor code cleanups
dovecot at dovecot.org
dovecot at dovecot.org
Sat May 9 12:09:07 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/7bd196b84518
changeset: 18593:7bd196b84518
user: Timo Sirainen <tss at iki.fi>
date: Sat May 09 15:07:13 2015 +0300
description:
lib-fts: Minor code cleanups
diffstat:
src/lib-fts/fts-filter-normalizer-icu.c | 2 +-
src/lib-fts/fts-filter.c | 8 ++------
src/lib-fts/fts-filter.h | 5 ++---
src/lib-fts/fts-tokenizer-address.c | 20 +++++++-------------
src/lib-fts/fts-tokenizer-generic-private.h | 3 +--
src/lib-fts/fts-tokenizer.c | 6 +++---
src/lib-fts/fts-tokenizer.h | 6 +++---
7 files changed, 19 insertions(+), 31 deletions(-)
diffs (157 lines):
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-filter-normalizer-icu.c
--- a/src/lib-fts/fts-filter-normalizer-icu.c Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-filter-normalizer-icu.c Sat May 09 15:07:13 2015 +0300
@@ -241,7 +241,7 @@
struct fts_filter **filter_r ATTR_UNUSED,
const char **error_r)
{
- *error_r = "libicu support not built in - can't use "ICU_NORMALIZER_FILTER_NAME;
+ *error_r = "libicu support not built in - can't use "ICU_NORMALIZER_FILTER_NAME;
return -1;
}
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-filter.c
--- a/src/lib-fts/fts-filter.c Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-filter.c Sat May 09 15:07:13 2015 +0300
@@ -90,12 +90,8 @@
fp->v->destroy(fp);
}
-/* TODO: Avoid multiple allocations by using a buffer in v->filter?
- Do this non-recursively? */
-int
-fts_filter_filter(struct fts_filter *filter, const char **token,
- const char **error_r)
-
+int fts_filter_filter(struct fts_filter *filter, const char **token,
+ const char **error_r)
{
int ret = 0;
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-filter.h
--- a/src/lib-fts/fts-filter.h Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-filter.h Sat May 09 15:07:13 2015 +0300
@@ -58,8 +58,7 @@
out (*token is also set to NULL) and -1 on error.
Input is also given via *token.
*/
-int
-fts_filter_filter(struct fts_filter *filter, const char **token,
- const char **error_r);
+int fts_filter_filter(struct fts_filter *filter, const char **token,
+ const char **error_r);
#endif
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-tokenizer-address.c
--- a/src/lib-fts/fts-tokenizer-address.c Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-address.c Sat May 09 15:07:13 2015 +0300
@@ -9,9 +9,6 @@
#define IS_DTEXT(c) \
(rfc822_atext_chars[(int)(unsigned char)(c)] == 2)
-#define FTS_DEFAULT_NO_PARENT FALSE
-#define FTS_DEFAULT_SEARCH FALSE
-
enum email_address_parser_state {
EMAIL_ADDRESS_PARSER_STATE_NONE = 0,
EMAIL_ADDRESS_PARSER_STATE_LOCALPART,
@@ -33,7 +30,7 @@
const char **error_r)
{
struct email_address_fts_tokenizer *tok;
- bool search = FTS_DEFAULT_SEARCH;
+ bool search = FALSE;
unsigned int i;
for (i = 0; settings[i] != NULL; i += 2) {
@@ -120,18 +117,18 @@
size_t *skip_r)
{
size_t pos = 0;
- bool at = FALSE;
+ bool seen_at = FALSE;
while (pos < size && (IS_ATEXT(data[pos]) ||
data[pos] == '@' || data[pos] == '.')) {
if (data[pos] == '@')
- at = TRUE;
+ seen_at = TRUE;
pos++;
- if (at)
+ if (seen_at)
break;
}
/* localpart and @ */
- if (at && (pos > 1 || str_len(tok->last_word) > 0)) {
+ if (seen_at && (pos > 1 || str_len(tok->last_word) > 0)) {
str_append_n(tok->last_word, data, pos);
*skip_r = pos;
return EMAIL_ADDRESS_PARSER_STATE_DOMAIN;
@@ -164,12 +161,9 @@
size_t *skip_r)
{
size_t pos = 0;
- const unsigned char *p = data;
- while (pos < size && (IS_DTEXT(*p) || *p == '.')) {
+ while (pos < size && (IS_DTEXT(data[pos]) || data[pos] == '.'))
pos++;
- p++;
- }
/* A complete domain name */
if ((pos > 1 && pos < size) || /* non-atext after atext in this data*/
(pos < size && !domain_is_empty(tok))) { /* non-atext after previous atext */
@@ -183,7 +177,7 @@
return EMAIL_ADDRESS_PARSER_STATE_DOMAIN;
}
/* not a domain. skip past no-good chars. */
- pos += skip_nonlocal_part(p, size - pos);
+ pos += skip_nonlocal_part(data + pos, size - pos);
*skip_r = pos;
return EMAIL_ADDRESS_PARSER_STATE_NONE;
}
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-tokenizer-generic-private.h
--- a/src/lib-fts/fts-tokenizer-generic-private.h Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-tokenizer-generic-private.h Sat May 09 15:07:13 2015 +0300
@@ -31,8 +31,7 @@
enum boundary_algorithm {
BOUNDARY_ALGORITHM_NONE = 0,
BOUNDARY_ALGORITHM_SIMPLE,
-#define ALGORITHM_SIMPLE_NAME "simple" /* TODO: could be public in
- fts-tokenizer.h */
+#define ALGORITHM_SIMPLE_NAME "simple"
BOUNDARY_ALGORITHM_TR29
#define ALGORITHM_TR29_NAME "tr29"
};
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-tokenizer.c
--- a/src/lib-fts/fts-tokenizer.c Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-tokenizer.c Sat May 09 15:07:13 2015 +0300
@@ -162,9 +162,9 @@
tok->v->reset(tok);
}
-int
-fts_tokenizer_next(struct fts_tokenizer *tok,
- const unsigned char *data, size_t size, const char **token_r)
+int fts_tokenizer_next(struct fts_tokenizer *tok,
+ const unsigned char *data, size_t size,
+ const char **token_r)
{
int ret;
diff -r 00240870d0bd -r 7bd196b84518 src/lib-fts/fts-tokenizer.h
--- a/src/lib-fts/fts-tokenizer.h Sat May 09 15:06:45 2015 +0300
+++ b/src/lib-fts/fts-tokenizer.h Sat May 09 15:07:13 2015 +0300
@@ -78,9 +78,9 @@
data must contain only valid complete UTF-8 sequences, but otherwise it
may be broken into however small pieces. */
-int
-fts_tokenizer_next(struct fts_tokenizer *tok,
- const unsigned char *data, size_t size, const char **token_r);
+int fts_tokenizer_next(struct fts_tokenizer *tok,
+ const unsigned char *data, size_t size,
+ const char **token_r);
const char *fts_tokenizer_name(const struct fts_tokenizer *tok);
More information about the dovecot-cvs
mailing list