[dovecot-cvs] dovecot/src/lib-storage/index index-mail-headers.c, 1.66, 1.67 index-mail.c, 1.105, 1.106 index-sort.c, 1.13, 1.14
cras at dovecot.org
cras at dovecot.org
Sun Sep 10 15:33:21 EEST 2006
Update of /var/lib/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv1034/lib-storage/index
Modified Files:
index-mail-headers.c index-mail.c index-sort.c
Log Message:
Removed type parameter from ARRAY_CREATE since it's not needed anymore.
Index: index-mail-headers.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail-headers.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- index-mail-headers.c 23 Aug 2006 10:39:42 -0000 1.66
+++ index-mail-headers.c 10 Sep 2006 12:33:18 -0000 1.67
@@ -181,11 +181,9 @@
mail->header_seq = mail->data.seq;
if (mail->header_data == NULL) {
mail->header_data = buffer_create_dynamic(default_pool, 4096);
- ARRAY_CREATE(&mail->header_lines, default_pool,
- struct index_mail_line, 32);
- ARRAY_CREATE(&mail->header_match, default_pool, uint8_t, 32);
- ARRAY_CREATE(&mail->header_match_lines, default_pool,
- unsigned int, 32);
+ ARRAY_CREATE(&mail->header_lines, default_pool, 32);
+ ARRAY_CREATE(&mail->header_match, default_pool, 32);
+ ARRAY_CREATE(&mail->header_match_lines, default_pool, 32);
} else {
buffer_set_used_size(mail->header_data, 0);
array_clear(&mail->header_lines);
@@ -488,7 +486,7 @@
i_assert(*line_idx != 0);
first_line_idx = *line_idx - 1;
- ARRAY_CREATE(&header_values, mail->data_pool, const char *, 4);
+ ARRAY_CREATE(&header_values, mail->data_pool, 4);
header = buffer_get_data(mail->header_data, NULL);
lines = array_get(&mail->header_lines, &lines_count);
@@ -564,7 +562,7 @@
return p_new(mail->data_pool, const char *, 1);
}
- ARRAY_CREATE(&header_values, mail->data_pool, const char *, 4);
+ ARRAY_CREATE(&header_values, mail->data_pool, 4);
/* cached. skip "header name: " parts in dest. */
for (i = 0; i < len; i++) {
Index: index-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- index-mail.c 30 Jul 2006 23:02:16 -0000 1.105
+++ index-mail.c 10 Sep 2006 12:33:18 -0000 1.106
@@ -147,8 +147,7 @@
return array_get(&data->keywords, NULL);
t_push();
- ARRAY_CREATE(&keyword_indexes_arr, pool_datastack_create(),
- unsigned int, 128);
+ ARRAY_CREATE(&keyword_indexes_arr, pool_datastack_create(), 128);
if (mail_index_lookup_keywords(mail->ibox->view, mail->data.seq,
&keyword_indexes_arr) < 0) {
mail_storage_set_index_error(mail->ibox);
@@ -163,7 +162,7 @@
}
names = array_get(mail->ibox->keyword_names, &names_count);
- ARRAY_CREATE(&data->keywords, mail->data_pool, const char *, count);
+ ARRAY_CREATE(&data->keywords, mail->data_pool, count);
for (i = 0; i < count; i++) {
const char *name;
i_assert(keyword_indexes[i] < names_count);
Index: index-sort.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-sort.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- index-sort.c 28 Jun 2006 13:10:49 -0000 1.13
+++ index-sort.c 10 Sep 2006 12:33:18 -0000 1.14
@@ -97,7 +97,7 @@
program->temp_mail = mail_alloc(t, 0, NULL);
program->reverse =
(program->sort_program[0] & MAIL_SORT_FLAG_REVERSE) != 0;
- ARRAY_CREATE(&program->nodes, default_pool, struct mail_sort_node, 64);
+ ARRAY_CREATE(&program->nodes, default_pool, 64);
for (i = 0; i < MAX_SORT_PROGRAM_SIZE; i++) {
program->sort_program[i] = sort_program[i];
@@ -696,8 +696,7 @@
/* we're not returning all the mails. have to create a temporary array
for all the nodes so we can set all the missing sort_ids. */
hdr = mail_index_get_header(t->ibox->view);
- ARRAY_CREATE(&program->all_nodes, default_pool,
- struct mail_sort_node, hdr->messages_count);
+ ARRAY_CREATE(&program->all_nodes, default_pool, hdr->messages_count);
ret = index_sort_build(program, hdr->messages_count);
array_free(&program->all_nodes);
if (ret < 0)
More information about the dovecot-cvs
mailing list