Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3970:23e76fc59a35 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't bother checking if mailbox_search_init() returns NULL. It never does.
author Timo Sirainen <tss@iki.fi>
date Thu, 02 Feb 2006 21:37:59 +0200
parents 884da753caba
children 539a58176e7b
files src/imap/cmd-search.c src/imap/imap-expunge.c src/pop3/client.c
diffstat 3 files changed, 7 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/cmd-search.c	Thu Feb 02 20:13:59 2006 +0200
+++ b/src/imap/cmd-search.c	Thu Feb 02 21:37:59 2006 +0200
@@ -24,10 +24,6 @@
 
 	trans = mailbox_transaction_begin(client->mailbox, 0);
 	ctx = mailbox_search_init(trans, charset, sargs, NULL);
-	if (ctx == NULL) {
-		mailbox_transaction_rollback(&trans);
-		return FALSE;
-	}
 
 	str_append(str, "* SEARCH");
 	mail = mail_alloc(trans, 0, NULL);
--- a/src/imap/imap-expunge.c	Thu Feb 02 20:13:59 2006 +0200
+++ b/src/imap/imap-expunge.c	Thu Feb 02 21:37:59 2006 +0200
@@ -20,18 +20,15 @@
 
 	t = mailbox_transaction_begin(box, 0);
 	ctx = mailbox_search_init(t, NULL, &search_arg, NULL);
-	if (ctx == NULL)
-		failed = TRUE;
-	else {
-		mail = mail_alloc(t, 0, NULL);
-		while (mailbox_search_next(ctx, mail) > 0) {
-			if (mail_expunge(mail) < 0) {
-				failed = TRUE;
-				break;
-			}
+
+	mail = mail_alloc(t, 0, NULL);
+	while (mailbox_search_next(ctx, mail) > 0) {
+		if (mail_expunge(mail) < 0) {
+			failed = TRUE;
+			break;
 		}
-		mail_free(&mail);
 	}
+	mail_free(&mail);
 
 	if (mailbox_search_deinit(&ctx) < 0)
 		return FALSE;
--- a/src/pop3/client.c	Thu Feb 02 20:13:59 2006 +0200
+++ b/src/pop3/client.c	Thu Feb 02 21:37:59 2006 +0200
@@ -75,11 +75,6 @@
 
 		t = mailbox_transaction_begin(client->mailbox, 0);
 		ctx = mailbox_search_init(t, NULL, &search_arg, NULL);
-		if (ctx == NULL) {
-			client_send_storage_error(client);
-			mailbox_transaction_rollback(&t);
-			break;
-		}
 
 		client->last_seen = 0;
 		client->total_size = 0;