[dovecot-cvs] dovecot/src/pop3 client.c,1.74,1.75

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv17914/pop3

Modified Files:
	client.c 
Log Message:
lib-storage doesn't need the ability to return syntax errors. They should be
checked before lib-storage is called.



Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/client.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- client.c	3 Apr 2007 08:34:32 -0000	1.74
+++ client.c	13 May 2007 15:46:10 -0000	1.75
@@ -132,7 +132,7 @@
 	struct client *client;
         enum mailbox_open_flags flags;
 	const char *errmsg;
-	bool syntax_error, temporary_error;
+	bool temporary_error;
 
 	/* always use nonblocking I/O */
 	net_set_nonblock(fd_in, TRUE);
@@ -172,7 +172,6 @@
 	if (client->mailbox == NULL) {
 		errmsg = t_strdup_printf("Couldn't open INBOX: %s",
 				mail_storage_get_last_error(storage,
-							    &syntax_error,
 							    &temporary_error));
 		i_error("%s", errmsg);
 		client_send_line(client, "-ERR [IN-USE] %s", errmsg);
@@ -182,8 +181,7 @@
 
 	if (!init_mailbox(client)) {
 		i_error("Couldn't init INBOX: %s",
-			mail_storage_get_last_error(storage, &syntax_error,
-						    &temporary_error));
+			mail_storage_get_last_error(storage, &temporary_error));
 		client_destroy(client, "Mailbox init failed");
 		return NULL;
 	}
@@ -337,7 +335,7 @@
 void client_send_storage_error(struct client *client)
 {
 	const char *error;
-	bool syntax, temporary_error;
+	bool temporary_error;
 
 	if (mailbox_is_inconsistent(client->mailbox)) {
 		client_send_line(client, "-ERR Mailbox is in inconsistent "
@@ -346,7 +344,7 @@
 		return;
 	}
 
-	error = mail_storage_get_last_error(client->inbox_ns->storage, &syntax,
+	error = mail_storage_get_last_error(client->inbox_ns->storage,
 					    &temporary_error);
 	client_send_line(client, "-ERR %s", error != NULL ? error :
 			 "BUG: Unknown error");