Mercurial > dovecot > original-hg > dovecot-1.2

changeset 4664:881ed99266a2 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New asserts / cleanup
author Timo Sirainen <tss@iki.fi>
date Fri, 13 Oct 2006 23:06:44 +0300
parents ebbc7cd727cd
children e4d7d01b0784
files src/imap-login/client.c src/login-common/ssl-proxy-openssl.c src/pop3-login/client.c
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client.c	Fri Oct 13 22:54:05 2006 +0300
+++ b/src/imap-login/client.c	Fri Oct 13 23:06:44 2006 +0300
@@ -420,6 +420,8 @@
 {
 	struct imap_client *client;
 
+	i_assert(fd != -1);
+
 	connection_queue_add(1);
 
 	/* always use nonblocking I/O */
--- a/src/login-common/ssl-proxy-openssl.c	Fri Oct 13 22:54:05 2006 +0300
+++ b/src/login-common/ssl-proxy-openssl.c	Fri Oct 13 23:06:44 2006 +0300
@@ -454,6 +454,8 @@
 	SSL *ssl;
 	int sfd[2];
 
+	i_assert(fd != -1);
+
 	*proxy_r = NULL;
 
 	if (!ssl_initialized) {
@@ -475,7 +477,7 @@
 		return -1;
 	}
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) == -1) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) {
 		i_error("socketpair() failed: %m");
 		SSL_free(ssl);
 		return -1;
--- a/src/pop3-login/client.c	Fri Oct 13 22:54:05 2006 +0300
+++ b/src/pop3-login/client.c	Fri Oct 13 23:06:44 2006 +0300
@@ -313,6 +313,8 @@
 {
 	struct pop3_client *client;
 
+	i_assert(fd != -1);
+
 	connection_queue_add(1);
 
 	/* always use nonblocking I/O */