From 95fb75425d38ec2a0c0d7e46f8d74b51557de68b Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 13 Dec 2001 20:32:42 +0000 Subject: merged some changes from the 1-0 branch that apparently never got merged into HEAD svn path=/trunk/; revision=15019 --- camel/camel-tcp-stream-raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'camel') diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c index 3b0244ccdc..e7003ac53d 100644 --- a/camel/camel-tcp-stream-raw.c +++ b/camel/camel-tcp-stream-raw.c @@ -236,7 +236,7 @@ stream_read (CamelStream *stream, char *buffer, size_t n) if (camel_operation_cancel_check (NULL)) { errno = EINTR; - return -1; + return -1; } cancel_fd = camel_operation_cancel_fd (NULL); @@ -419,7 +419,7 @@ socket_connect (struct hostent *h, int port) tv.tv_usec = 0; tv.tv_sec = 60 * 4; - if (select (fdmax, &rdset, &wrset, 0, &tv) == 0) { + if (select (fdmax, &rdset, &wrset, 0, &tv) <= 0) { close (fd); errno = ETIMEDOUT; return -1; -- cgit v1.2.3