dovecot-2.0: imap, pop3: Added an assert to client_connected().

dovecot at dovecot.org dovecot at dovecot.org
Wed Jun 30 22:30:14 EEST 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/1799fbbd104b
changeset: 11661:1799fbbd104b
user:      Pascal Volk <user at localhost.localdomain.org>
date:      Wed Jun 30 18:49:23 2010 +0000
description:
imap, pop3: Added an assert to client_connected().

diffstat:

 src/imap/main.c |  11 +++++------
 src/pop3/main.c |  11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diffs (42 lines):

diff -r b07bb05789cf -r 1799fbbd104b src/imap/main.c
--- a/src/imap/main.c	Wed Jun 30 17:30:34 2010 +0100
+++ b/src/imap/main.c	Wed Jun 30 18:49:23 2010 +0000
@@ -278,12 +278,11 @@
 
 static void client_connected(struct master_service_connection *conn)
 {
-	if (master_login == NULL) {
-		/* running standalone, we shouldn't even get here */
-	} else {
-		master_service_client_connection_accept(conn);
-		master_login_add(master_login, conn->fd);
-	}
+	/* when running standalone, we shouldn't even get here */
+	i_assert(master_login != NULL);
+
+	master_service_client_connection_accept(conn);
+	master_login_add(master_login, conn->fd);
 }
 
 int main(int argc, char *argv[])
diff -r b07bb05789cf -r 1799fbbd104b src/pop3/main.c
--- a/src/pop3/main.c	Wed Jun 30 17:30:34 2010 +0100
+++ b/src/pop3/main.c	Wed Jun 30 18:49:23 2010 +0000
@@ -174,12 +174,11 @@
 
 static void client_connected(struct master_service_connection *conn)
 {
-	if (master_login == NULL) {
-		/* running standalone, we shouldn't even get here */
-	} else {
-		master_service_client_connection_accept(conn);
-		master_login_add(master_login, conn->fd);
-	}
+	/* when running standalone, we shouldn't even get here */
+	i_assert(master_login != NULL);
+
+	master_service_client_connection_accept(conn);
+	master_login_add(master_login, conn->fd);
 }
 
 int main(int argc, char *argv[])


More information about the dovecot-cvs mailing list