[dovecot-cvs] dovecot/src/lib-storage/index index-mail-headers.c, 1.67, 1.68 index-mail.c, 1.106, 1.107 index-sort.c, 1.14, 1.15

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv24049/lib-storage/index

Modified Files:
	index-mail-headers.c index-mail.c index-sort.c 
Log Message:
Replaced ARRAY_CREATE() macro with [ipt]_array_init() macros. The macro
has no side effects so it might as well be lowercased.



Index: index-mail-headers.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail-headers.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- index-mail-headers.c	10 Sep 2006 12:33:18 -0000	1.67
+++ index-mail-headers.c	10 Sep 2006 12:48:25 -0000	1.68
@@ -181,9 +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, 32);
-		ARRAY_CREATE(&mail->header_match, default_pool, 32);
-		ARRAY_CREATE(&mail->header_match_lines, default_pool, 32);
+		i_array_init(&mail->header_lines, 32);
+		i_array_init(&mail->header_match, 32);
+		i_array_init(&mail->header_match_lines, 32);
 	} else {
 		buffer_set_used_size(mail->header_data, 0);
 		array_clear(&mail->header_lines);
@@ -486,7 +486,7 @@
 	i_assert(*line_idx != 0);
 	first_line_idx = *line_idx - 1;
 
-	ARRAY_CREATE(&header_values, mail->data_pool, 4);
+	p_array_init(&header_values, mail->data_pool, 4);
 	header = buffer_get_data(mail->header_data, NULL);
 
 	lines = array_get(&mail->header_lines, &lines_count);
@@ -562,7 +562,7 @@
 		return p_new(mail->data_pool, const char *, 1);
 	}
 
-	ARRAY_CREATE(&header_values, mail->data_pool, 4);
+	p_array_init(&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.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- index-mail.c	10 Sep 2006 12:33:18 -0000	1.106
+++ index-mail.c	10 Sep 2006 12:48:25 -0000	1.107
@@ -147,7 +147,7 @@
 		return array_get(&data->keywords, NULL);
 
 	t_push();
-	ARRAY_CREATE(&keyword_indexes_arr, pool_datastack_create(), 128);
+	t_array_init(&keyword_indexes_arr, 128);
 	if (mail_index_lookup_keywords(mail->ibox->view, mail->data.seq,
 				       &keyword_indexes_arr) < 0) {
 		mail_storage_set_index_error(mail->ibox);
@@ -162,7 +162,7 @@
 	}
 
 	names = array_get(mail->ibox->keyword_names, &names_count);
-	ARRAY_CREATE(&data->keywords, mail->data_pool, count);
+	p_array_init(&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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- index-sort.c	10 Sep 2006 12:33:18 -0000	1.14
+++ index-sort.c	10 Sep 2006 12:48:25 -0000	1.15
@@ -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, 64);
+	i_array_init(&program->nodes, 64);
 
 	for (i = 0; i < MAX_SORT_PROGRAM_SIZE; i++) {
 		program->sort_program[i] = sort_program[i];
@@ -696,7 +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, hdr->messages_count);
+	i_array_init(&program->all_nodes, hdr->messages_count);
 	ret = index_sort_build(program, hdr->messages_count);
 	array_free(&program->all_nodes);
 	if (ret < 0)