diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-10-30 03:09:01 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-10-30 03:09:01 +0000 |
| commit | 1898c6933b1af3b5e5bcf69e614cefa410d3faef (patch) | |
| tree | 5e38f54437e37af983d1a412e3c23549f077ff19 /camel/camel-stream-buffer.h | |
| parent | e2ccb5adabcfca2e40d7c8819d5806188265a541 (diff) | |
| download | evolution-data-server-1898c6933b1af3b5e5bcf69e614cefa410d3faef.tar.gz | |
Removed. (stream_write): Keep looping (non-blocking case) if errno is
2001-10-29 Jeffrey Stedfast <fejj@ximian.com>
* camel-tcp-stream-openssl.c (my_SSL_write): Removed.
(stream_write): Keep looping (non-blocking case) if errno is
EAGAIN, EINTR or EWOULDBLOCK. For NONBLOCKing I/O, sync up with
CamelTcpStreamRaw. As with CamelTcpStreamRaw/SSL - make sure to
write out everything before returning.
(my_SSL_read): Removed.
(stream_read): Just call ssl_error_to_errno() and check the errno
values that we care about so we can keep the general look of all
this stream code the same. Also when checking the return value of
SSL_read, check for <0 instead of ==-1 since the man page for
SSL_read doesn't say it will return -1 on fail, it just says <0.
(stream_flush): Don't fsync() since syncing on a socket is a Bad
Thing (tm).
* camel-tcp-stream-ssl.c (stream_write): Make sure we write out
everything just like in camel-tcp-stream-raw.c.
* camel-stream-buffer.c (camel_stream_buffer_gets): If
camel_stream_read() returns -1, don't necessarily return -1 to our
caller since it's possible that we did actually "read" some data
(ie, we copied some pre-buffered data into the out buffer).
* camel-stream-buffer.h: Removed CAMEL_STREAM_BUFFER_NEWLINE since
it never got used anywhere and it isn't supported anyway.
Diffstat (limited to 'camel/camel-stream-buffer.h')
| -rw-r--r-- | camel/camel-stream-buffer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h index db93971fd..03a851706 100644 --- a/camel/camel-stream-buffer.h +++ b/camel/camel-stream-buffer.h @@ -41,10 +41,8 @@ extern "C" { #define CAMEL_STREAM_BUFFER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass)) #define CAMEL_IS_STREAM_BUFFER(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE)) -typedef enum -{ +typedef enum { CAMEL_STREAM_BUFFER_BUFFER = 0, - CAMEL_STREAM_BUFFER_NEWLINE, CAMEL_STREAM_BUFFER_NONE, CAMEL_STREAM_BUFFER_READ = 0x00, CAMEL_STREAM_BUFFER_WRITE = 0x80, |