[dovecot-cvs] dovecot/src/lib istream-file.c, 1.16, 1.17 istream-limit.c, 1.3, 1.4 istream.c, 1.15, 1.16 istream.h, 1.9, 1.10

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory talvi:/tmp/cvs-serv27426/lib

Modified Files:
	istream-file.c istream-limit.c istream.c istream.h 
Log Message:
Renamed istream->eof to istream->disconnected which is what it currently
does.



Index: istream-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-file.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- istream-file.c	27 Apr 2004 20:25:53 -0000	1.16
+++ istream-file.c	18 Jun 2004 00:32:25 -0000	1.17
@@ -153,14 +153,14 @@
 		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;
 			}
 

Index: istream-limit.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-limit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- istream-limit.c	27 Apr 2004 20:25:53 -0000	1.3
+++ istream-limit.c	18 Jun 2004 00:32:25 -0000	1.4
@@ -62,7 +62,7 @@
 		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;

Index: istream.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- istream.c	10 Nov 2003 21:36:13 -0000	1.15
+++ istream.c	18 Jun 2004 00:32:25 -0000	1.16
@@ -46,7 +46,7 @@
 	if (stream->closed)
 		return -1;
 
-	stream->eof = FALSE;
+	stream->disconnected = FALSE;
 	return _stream->read(_stream);
 }
 
@@ -86,7 +86,7 @@
 	if (stream->closed)
 		return;
 
-	stream->eof = FALSE;
+	stream->disconnected = FALSE;
 	_stream->seek(_stream, v_offset);
 }
 

Index: istream.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- istream.h	9 Nov 2003 18:26:25 -0000	1.9
+++ istream.h	18 Jun 2004 00:32:25 -0000	1.10
@@ -7,7 +7,7 @@
 	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;
 };