Renamed istream->eof to istream->disconnected which is what it currently

does.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-save.c b/src/lib-storage/mail-save.c
index cdc758f24fee8b7f98a0d30d9264b4d11d7e0a6f..e8ae86090d4d7eb7111f1770bb42347b81a029b7 100644 (file)
--- a/src/lib-storage/mail-save.c
+++ b/src/lib-storage/mail-save.c
@@ -166,7 +166,7 @@ int mail_storage_save(struct mail_storage *storage, const char *path,
                        errno = input->stream_errno;
                        if (errno == 0) {
                                /* EOF */
-                               if (input->eof) {
+                               if (input->disconnected) {
                                        /* too early */
                                        mail_storage_set_error(storage,
                                                "Unexpected EOF");

diff --git a/src/lib/istream-file.c b/src/lib/istream-file.c
index 183e1e534eb8bb4acfe1938c3abd795d8dd135af..db91a41d337d4bba37a8d6bdca39f894aebc76a8 100644 (file)
--- a/src/lib/istream-file.c
+++ b/src/lib/istream-file.c
@@ -153,14 +153,14 @@ static ssize_t _read(struct _istream *stream)
                if (ret == 0) {
                        /* EOF */
                        if (!fstream->file)
-                               stream->istream.eof = TRUE;
+                               stream->istream.disconnected = TRUE;
                        return -1;
                }
 
                if (ret < 0) {
                        if (errno == ECONNRESET || errno == ETIMEDOUT) {
                                /* treat as disconnection */
-                               stream->istream.eof = TRUE;
+                               stream->istream.disconnected = TRUE;
                                return -1;
                        }
 

diff --git a/src/lib/istream-limit.c b/src/lib/istream-limit.c
index 330375eb1a57d0875a16cd799c671cbcc3e20d43..9e7f9c2972df4778e5e97d9cf314f1900f5a7969 100644 (file)
--- a/src/lib/istream-limit.c
+++ b/src/lib/istream-limit.c
@@ -62,7 +62,7 @@ static ssize_t _read(struct _istream *stream)
                if (stream->skip == 0)
                        return -2;
        }
-       stream->istream.eof = lstream->input->eof;
+       stream->istream.disconnected = lstream->input->disconnected;
 
        stream->pos -= stream->skip;
        stream->skip = 0;

diff --git a/src/lib/istream.c b/src/lib/istream.c
index c9a1e98d97bfc20a652ab5fc503109425f8d23fd..23feaed0521b14e97920de02de50c956d4ef12ca 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -46,7 +46,7 @@ ssize_t i_stream_read(struct istream *stream)
        if (stream->closed)
                return -1;
 
-       stream->eof = FALSE;
+       stream->disconnected = FALSE;
        return _stream->read(_stream);
 }
 
@@ -86,7 +86,7 @@ void i_stream_seek(struct istream *stream, uoff_t v_offset)
        if (stream->closed)
                return;
 
-       stream->eof = FALSE;
+       stream->disconnected = FALSE;
        _stream->seek(_stream, v_offset);
 }
 

diff --git a/src/lib/istream.h b/src/lib/istream.h
index b8ccf86e7751661f829785e621013873c0726c8a..823c6f16eb841b8bf0a62ea59707a31b75f2c850 100644 (file)
--- a/src/lib/istream.h
+++ b/src/lib/istream.h
@@ -7,7 +7,7 @@ struct istream {
        int stream_errno;
        unsigned int mmaped:1; /* be careful when copying data */
        unsigned int closed:1;
-       unsigned int eof:1;
+       unsigned int disconnected:1;
 
        struct _istream *real_stream;
 };