[dovecot-cvs] dovecot/src/imap cmd-search.c, 1.28, 1.29 imap-expunge.c, 1.8, 1.9

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv3148/imap

Modified Files:
	cmd-search.c imap-expunge.c 
Log Message:
Don't bother checking if mailbox_search_init() returns NULL. It never does.



Index: cmd-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-search.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cmd-search.c	14 Jan 2006 18:47:21 -0000	1.28
+++ cmd-search.c	2 Feb 2006 19:37:59 -0000	1.29
@@ -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);

Index: imap-expunge.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/imap-expunge.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imap-expunge.c	14 Jan 2006 18:47:21 -0000	1.8
+++ imap-expunge.c	2 Feb 2006 19:37:59 -0000	1.9
@@ -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;