Rework parts and task structure:

- Now text_parts, parts and received are arrays
- Pre-allocate arrays with some reasonable defaults
- Use arrays instead of lists in plugins and checks
- Remove unused fields from task structure
- Rework mime_foreach callback function
- Remove deprecated scan_milliseconds field

2 files changed, 8 insertions, 16 deletions

diff --git a/src/libstat/learn_cache/sqlite3_cache.c b/src/libstat/learn_cache/sqlite3_cache.c
index fa366877e..ebfb5510c 100644
--- a/src/libstat/learn_cache/sqlite3_cache.c
+++ b/src/libstat/learn_cache/sqlite3_cache.c
@@ -247,24 +247,20 @@ rspamd_stat_cache_sqlite3_process (struct rspamd_task *task,
 	blake2b_state st;
 	rspamd_fstring_t *word;
 	guchar out[BLAKE2B_OUTBYTES];
-	GList *cur;
-	guint i;
+	guint i, j;
 
 	if (ctx != NULL && ctx->db != NULL) {
 		blake2b_init (&st, sizeof (out));
-		cur = task->text_parts;
 
-		while (cur) {
-			part = (struct mime_text_part *)cur->data;
+		for (i = 0; i < task->text_parts->len; i ++) {
+			part = g_ptr_array_index (task->text_parts, i);
 
 			if (part->words != NULL) {
-				for (i = 0; i < part->words->len; i ++) {
-					word = &g_array_index (part->words, rspamd_fstring_t, i);
+				for (j = 0; j < part->words->len; j ++) {
+					word = &g_array_index (part->words, rspamd_fstring_t, j);
 					blake2b_update (&st, word->begin, word->len);
 				}
 			}
-
-			cur = g_list_next (cur);
 		}
 
 		blake2b_final (&st, out, sizeof (out));
diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c
index 9c261eccd..d147a29d3 100644
--- a/src/libstat/stat_process.c
+++ b/src/libstat/stat_process.c
@@ -308,12 +308,10 @@ rspamd_stat_process_tokenize (struct rspamd_tokenizer_config *cf,
 	struct mime_text_part *part;
 	GArray *words;
 	gchar *sub;
-	GList *cur;
-
-	cur = task->text_parts;
+	guint i;
 
-	while (cur != NULL) {
-		part = (struct mime_text_part *)cur->data;
+	for (i = 0; i < task->text_parts->len; i ++) {
+		part = g_ptr_array_index (task->text_parts, i);
 
 		if (!IS_PART_EMPTY (part) && part->words != NULL) {
 			if (compat) {
@@ -325,8 +323,6 @@ rspamd_stat_process_tokenize (struct rspamd_tokenizer_config *cf,
 					part->normalized_words, tok->tokens, IS_PART_UTF (part));
 			}
 		}
-
-		cur = g_list_next (cur);
 	}
 
 	if (task->subject != NULL) {