Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6271:9ab5611495f0 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compile fix
author Timo Sirainen <tss@iki.fi>
date Sun, 12 Aug 2007 16:31:12 +0300
parents 87c617482388
children cff0c129b3da
files src/plugins/fts/fts-storage.c
diffstat 1 files changed, 10 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/fts/fts-storage.c	Sun Aug 12 16:29:44 2007 +0300
+++ b/src/plugins/fts/fts-storage.c	Sun Aug 12 16:31:12 2007 +0300
@@ -84,9 +84,9 @@
 	return ret;
 }
 
-static int uid_range_to_seq(struct mailbox *box,
-			    ARRAY_TYPE(seq_range) *uid_range,
-			    ARRAY_TYPE(seq_range) *seq_range)
+static void uid_range_to_seq(struct mailbox *box,
+			     ARRAY_TYPE(seq_range) *uid_range,
+			     ARRAY_TYPE(seq_range) *seq_range)
 {
 	const struct seq_range *range;
 	struct seq_range new_range;
@@ -95,16 +95,11 @@
 	range = array_get(uid_range, &count);
 	i_array_init(seq_range, count);
 	for (i = 0; i < count; i++) {
-		if (mailbox_get_uids(box, range[i].seq1, range[i].seq2,
-				     &new_range.seq1, &new_range.seq2) < 0) {
-			array_free(seq_range);
-			return -1;
-		}
-
+		mailbox_get_uids(box, range[i].seq1, range[i].seq2,
+				 &new_range.seq1, &new_range.seq2);
 		if (new_range.seq1 != 0)
 			array_append(seq_range, &new_range, 1);
 	}
-	return 0;
 }
 
 static int fts_build_mail_flush(struct fts_storage_build_context *ctx)
@@ -246,9 +241,8 @@
 	}
 
 	memset(&seqset, 0, sizeof(seqset));
-	if (mailbox_get_uids(t->box, last_uid+1, (uint32_t)-1,
-			     &seqset.seq1, &seqset.seq2) < 0)
-		return -1;
+	mailbox_get_uids(t->box, last_uid+1, (uint32_t)-1,
+			 &seqset.seq1, &seqset.seq2);
 	if (seqset.seq1 == 0) {
 		/* no new messages */
 		return 0;
@@ -260,11 +254,8 @@
 		i_assert(last_uid < last_uid_locked);
 
 		last_uid = last_uid_locked;
-		if (mailbox_get_uids(t->box, last_uid+1, (uint32_t)-1,
-				     &seqset.seq1, &seqset.seq2) < 0) {
-			(void)fts_backend_build_deinit(build);
-			return -1;
-		}
+		mailbox_get_uids(t->box, last_uid+1, (uint32_t)-1,
+				 &seqset.seq1, &seqset.seq2);
 		if (seqset.seq1 == 0) {
 			/* no new messages */
 			(void)fts_backend_build_deinit(build);
@@ -467,7 +458,7 @@
 
 	fts_search_filter_args(fctx, fctx->args, &uid_result);
 
-	(void)uid_range_to_seq(box, &uid_result, &fctx->result);
+	uid_range_to_seq(box, &uid_result, &fctx->result);
 	array_free(&uid_result);
 }