dovecot-2.2: lib-storage: Moved index_mail.data_pool to mail_pri...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Sep 15 15:46:18 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/c436a6c3f7d2
changeset: 15055:c436a6c3f7d2
user: Timo Sirainen <tss at iki.fi>
date: Sat Sep 15 15:46:01 2012 +0300
description:
lib-storage: Moved index_mail.data_pool to mail_private.data_pool
diffstat:
src/lib-storage/index/dbox-common/dbox-mail.c | 2 +-
src/lib-storage/index/imapc/imapc-mail.c | 4 +-
src/lib-storage/index/index-mail-binary.c | 6 ++--
src/lib-storage/index/index-mail-headers.c | 38 +++++++++++++-------------
src/lib-storage/index/index-mail.c | 32 +++++++++++-----------
src/lib-storage/index/index-mail.h | 2 -
src/lib-storage/index/index-search.c | 2 +-
src/lib-storage/index/maildir/maildir-mail.c | 10 +++---
src/lib-storage/index/mbox/mbox-mail.c | 2 +-
src/lib-storage/mail-storage-private.h | 2 +-
src/plugins/virtual/virtual-mail.c | 8 ++--
11 files changed, 53 insertions(+), 55 deletions(-)
diffs (truncated from 488 to 300 lines):
diff -r 07ac1dbcc033 -r c436a6c3f7d2 src/lib-storage/index/dbox-common/dbox-mail.c
--- a/src/lib-storage/index/dbox-common/dbox-mail.c Sat Sep 15 03:49:23 2012 +0300
+++ b/src/lib-storage/index/dbox-common/dbox-mail.c Sat Sep 15 15:46:01 2012 +0300
@@ -166,7 +166,7 @@
const char *value;
string_t *str;
- str = str_new(imail->data_pool, 64);
+ str = str_new(imail->mail.data_pool, 64);
if (mail_cache_lookup_field(imail->mail.mail.transaction->cache_view,
str, imail->mail.mail.seq,
ibox->cache_fields[cache_field].idx) > 0) {
diff -r 07ac1dbcc033 -r c436a6c3f7d2 src/lib-storage/index/imapc/imapc-mail.c
--- a/src/lib-storage/index/imapc/imapc-mail.c Sat Sep 15 03:49:23 2012 +0300
+++ b/src/lib-storage/index/imapc/imapc-mail.c Sat Sep 15 15:46:01 2012 +0300
@@ -333,7 +333,7 @@
sha1_result(&sha1_ctx, sha1_output);
sha1_str = binary_to_hex(sha1_output, sizeof(sha1_output));
- imail->data.guid = p_strdup(imail->data_pool, sha1_str);
+ imail->data.guid = p_strdup(imail->mail.data_pool, sha1_str);
return 0;
}
@@ -350,7 +350,7 @@
return 0;
}
- str = str_new(imail->data_pool, 64);
+ str = str_new(imail->mail.data_pool, 64);
if (mail_cache_lookup_field(_mail->transaction->cache_view,
str, imail->mail.mail.seq, cache_idx) > 0) {
*value_r = str_c(str);
diff -r 07ac1dbcc033 -r c436a6c3f7d2 src/lib-storage/index/index-mail-binary.c
--- a/src/lib-storage/index/index-mail-binary.c Sat Sep 15 03:49:23 2012 +0300
+++ b/src/lib-storage/index/index-mail-binary.c Sat Sep 15 15:46:01 2012 +0300
@@ -261,7 +261,7 @@
}
if (found) {
bin_part.next = *msg_bin_parts;
- *msg_bin_parts = p_new(mail->data_pool,
+ *msg_bin_parts = p_new(mail->mail.data_pool,
struct message_binary_part, 1);
**msg_bin_parts = bin_part;
}
@@ -362,8 +362,8 @@
if (ret <= 0)
return FALSE;
- if (message_binary_part_deserialize(mail->data_pool, part_buf->data,
- part_buf->used,
+ if (message_binary_part_deserialize(mail->mail.data_pool,
+ part_buf->data, part_buf->used,
&mail->data.bin_parts) < 0) {
mail_cache_set_corrupted(mail->mail.mail.box->cache,
"Corrupted cached binary.parts data");
diff -r 07ac1dbcc033 -r c436a6c3f7d2 src/lib-storage/index/index-mail-headers.c
--- a/src/lib-storage/index/index-mail-headers.c Sat Sep 15 03:49:23 2012 +0300
+++ b/src/lib-storage/index/index-mail-headers.c Sat Sep 15 15:46:01 2012 +0300
@@ -256,7 +256,7 @@
mail->ibox->cache_fields[MAIL_CACHE_IMAP_ENVELOPE].idx;
string_t *str;
- str = str_new(mail->data_pool, 256);
+ str = str_new(mail->mail.data_pool, 256);
imap_envelope_write_part_data(mail->data.envelope_data, str);
mail->data.envelope = str_c(str);
@@ -280,11 +280,11 @@
if (data->save_bodystructure_header) {
i_assert(part != NULL);
- imap_bodystructure_parse_header(mail->data_pool, part, hdr);
+ imap_bodystructure_parse_header(mail->mail.data_pool, part, hdr);
}
if (data->save_envelope) {
- imap_envelope_parse_header(mail->data_pool,
+ imap_envelope_parse_header(mail->mail.data_pool,
&data->envelope_data, hdr);
if (hdr == NULL)
@@ -375,7 +375,7 @@
index_mail_parse_header_init(mail, NULL);
mail->data.parser_ctx =
- message_parser_init(mail->data_pool, input,
+ message_parser_init(mail->mail.data_pool, input,
hdr_parser_flags, msg_parser_flags);
i_stream_unref(&input);
return input2;
@@ -390,7 +390,7 @@
(void)message_parser_deinit(&data->parser_ctx, &parts);
if (data->parts == NULL) {
- data->parser_ctx = message_parser_init(mail->data_pool,
+ data->parser_ctx = message_parser_init(mail->mail.data_pool,
data->stream,
hdr_parser_flags,
msg_parser_flags);
@@ -441,7 +441,7 @@
imap_envelope_parse_callback(struct message_header_line *hdr,
struct index_mail *mail)
{
- imap_envelope_parse_header(mail->data_pool,
+ imap_envelope_parse_header(mail->mail.data_pool,
&mail->data.envelope_data, hdr);
if (hdr == NULL)
@@ -457,7 +457,7 @@
uoff_t old_offset;
string_t *str;
- str = str_new(mail->data_pool, 256);
+ str = str_new(mail->mail.data_pool, 256);
if (index_mail_cache_lookup_field(mail, str,
cache_field_envelope) > 0) {
mail->data.envelope = str_c(str);
@@ -555,7 +555,7 @@
i_assert(*line_idx != 0);
first_line_idx = *line_idx - 1;
- p_array_init(&header_values, mail->data_pool, 4);
+ p_array_init(&header_values, mail->mail.data_pool, 4);
header = buffer_get_data(mail->header_data, NULL);
lines = array_get(&mail->header_lines, &lines_count);
@@ -569,7 +569,7 @@
if (skip_header(&value_start, value_end - value_start)) {
if (value_start != value_end && value_end[-1] == '\n')
value_end--;
- value = p_strndup(mail->data_pool, value_start,
+ value = p_strndup(mail->mail.data_pool, value_start,
value_end - value_start);
array_append(&header_values, &value, 1);
}
@@ -598,11 +598,11 @@
field_idx = get_header_field_idx(_mail->box, field,
MAIL_CACHE_DECISION_TEMP);
- dest = str_new(mail->data_pool, 128);
+ dest = str_new(mail->mail.data_pool, 128);
if (mail_cache_lookup_headers(_mail->transaction->cache_view, dest,
_mail->seq, &field_idx, 1) <= 0) {
/* not in cache / error - first see if it's already parsed */
- p_free(mail->data_pool, dest);
+ p_free(mail->mail.data_pool, dest);
if (mail->header_seq != mail->data.seq ||
index_mail_header_is_parsed(mail, field_idx) < 0) {
@@ -619,7 +619,7 @@
if ((ret = index_mail_header_is_parsed(mail, field_idx)) <= 0) {
/* not found */
i_assert(ret != -1);
- *value_r = p_new(mail->data_pool, const char *, 1);
+ *value_r = p_new(mail->mail.data_pool, const char *, 1);
return 0;
}
*value_r = index_mail_get_parsed_header(mail, field_idx);
@@ -630,11 +630,11 @@
if (len == 0) {
/* cached as nonexistent. */
- *value_r = p_new(mail->data_pool, const char *, 1);
+ *value_r = p_new(mail->mail.data_pool, const char *, 1);
return 0;
}
- p_array_init(&header_values, mail->data_pool, 4);
+ p_array_init(&header_values, mail->mail.data_pool, 4);
/* cached. skip "header name: " parts in dest. */
for (i = 0; i < len; i++) {
@@ -704,21 +704,21 @@
count = str_array_length(list);
if (count > max_count)
count = max_count;
- decoded_list = p_new(mail->data_pool, const char *, count + 1);
+ decoded_list = p_new(mail->mail.data_pool, const char *, count + 1);
str = t_str_new(512);
for (i = 0; i < count; i++) {
str_truncate(str, 0);
input = list[i];
/* unfold all lines into a single line */
- if (unfold_header(mail->data_pool, &input) < 0)
+ if (unfold_header(mail->mail.data_pool, &input) < 0)
return -1;
/* decode MIME encoded-words. decoding may also add new LFs. */
message_header_decode_utf8((const unsigned char *)input,
strlen(input), str, FALSE);
if (strcmp(str_c(str), input) != 0)
- input = p_strdup(mail->data_pool, str_c(str));
+ input = p_strdup(mail->mail.data_pool, str_c(str));
decoded_list[i] = input;
}
*_list = decoded_list;
@@ -803,7 +803,7 @@
return -1;
}
- dest = str_new(mail->data_pool, 256);
+ dest = str_new(mail->mail.data_pool, 256);
if (mail_cache_lookup_headers(_mail->transaction->cache_view, dest,
_mail->seq, headers->idx,
headers->count) > 0) {
@@ -818,7 +818,7 @@
return 0;
}
/* not in cache / error */
- p_free(mail->data_pool, dest);
+ p_free(mail->mail.data_pool, dest);
if (mail_get_hdr_stream(_mail, NULL, &input) < 0)
return -1;
diff -r 07ac1dbcc033 -r c436a6c3f7d2 src/lib-storage/index/index-mail.c
--- a/src/lib-storage/index/index-mail.c Sat Sep 15 03:49:23 2012 +0300
+++ b/src/lib-storage/index/index-mail.c Sat Sep 15 15:46:01 2012 +0300
@@ -83,7 +83,7 @@
if (ret <= 0)
return NULL;
- parts = message_part_deserialize(mail->data_pool, part_buf->data,
+ parts = message_part_deserialize(mail->mail.data_pool, part_buf->data,
part_buf->used, &error);
if (parts == NULL) {
mail_cache_set_corrupted(mail->mail.mail.box->cache,
@@ -210,7 +210,7 @@
keyword_indexes = array_get(&data->keyword_indexes, &count);
names = array_get(mail->ibox->keyword_names, &names_count);
- p_array_init(&data->keywords, mail->data_pool, count + 1);
+ p_array_init(&data->keywords, mail->mail.data_pool, count + 1);
for (i = 0; i < count; i++) {
const char *name;
i_assert(keyword_indexes[i] < names_count);
@@ -231,7 +231,7 @@
struct index_mail_data *data = &mail->data;
if (!array_is_created(&data->keyword_indexes)) {
- p_array_init(&data->keyword_indexes, mail->data_pool, 32);
+ p_array_init(&data->keyword_indexes, mail->mail.data_pool, 32);
mail_index_lookup_keywords(_mail->transaction->view,
mail->data.seq,
&data->keyword_indexes);
@@ -654,7 +654,7 @@
_mail->seq, cache_field_bodystructure);
}
if (cache_bodystructure) {
- str = str_new(mail->data_pool, 128);
+ str = str_new(mail->mail.data_pool, 128);
imap_bodystructure_write(data->parts, str, TRUE);
data->bodystructure = str_c(str);
@@ -686,7 +686,7 @@
}
if (cache_body) {
- str = str_new(mail->data_pool, 128);
+ str = str_new(mail->mail.data_pool, 128);
imap_bodystructure_write(data->parts, str, FALSE);
data->body = str_c(str);
@@ -841,7 +841,7 @@
i_assert(!data->save_bodystructure_header);
message_parser_parse_body(data->parser_ctx,
parse_bodystructure_part_header,
- mail->data_pool);
+ mail->mail.data_pool);
data->save_bodystructure_body = FALSE;
data->parsed_bodystructure = TRUE;
} else {
@@ -1000,14 +1000,14 @@
switch (field) {
case MAIL_CACHE_IMAP_BODY:
if (data->body == NULL) {
- str = str_new(mail->data_pool, 128);
+ str = str_new(mail->mail.data_pool, 128);
imap_bodystructure_write(data->parts, str, FALSE);
data->body = str_c(str);
}
break;
case MAIL_CACHE_IMAP_BODYSTRUCTURE:
if (data->bodystructure == NULL) {
- str = str_new(mail->data_pool, 128);
+ str = str_new(mail->mail.data_pool, 128);
imap_bodystructure_write(data->parts, str, TRUE);
data->bodystructure = str_c(str);
}
@@ -1055,7 +1055,7 @@
4) parse body structure, and save BODY/BODYSTRUCTURE
depending on what we want cached */
- str = str_new(mail->data_pool, 128);
+ str = str_new(mail->mail.data_pool, 128);
if ((mail->data.cache_flags &
MAIL_CACHE_FLAG_TEXT_PLAIN_7BIT_ASCII) != 0 &&
get_cached_parts(mail)) {
@@ -1067,7 +1067,7 @@
More information about the dovecot-cvs
mailing list