diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-14 04:32:42 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-14 04:32:42 +0800 |
| commit | 95fb75425d38ec2a0c0d7e46f8d74b51557de68b (patch) | |
| tree | 83a307abd0edff4de4b489583eeded9a2b577e60 | |
| parent | d103ae62e11c1180f665e242dc0fac1fa0d0f016 (diff) | |
| download | gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.tar gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.tar.gz gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.tar.bz2 gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.tar.lz gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.tar.xz gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.tar.zst gsoc2013-evolution-95fb75425d38ec2a0c0d7e46f8d74b51557de68b.zip | |
merged some changes from the 1-0 branch that apparently never got merged into HEAD
svn path=/trunk/; revision=15019
| -rw-r--r-- | camel/camel-tcp-stream-raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |