Mercurial > dovecot > original-hg > dovecot-1.2

changeset 4766:b96086a311a9 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When i/ostream is closed, change the fd to be -1 so it won't be accidentally used.
author Timo Sirainen <tss@iki.fi>
date Tue, 07 Nov 2006 15:58:56 +0200
parents 7673830076ef
children f7fa27e435ef
files src/lib/istream-file.c src/lib/istream-mmap.c src/lib/ostream-file.c
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/istream-file.c	Tue Nov 07 15:57:30 2006 +0200
+++ b/src/lib/istream-file.c	Tue Nov 07 15:58:56 2006 +0200
@@ -33,8 +33,8 @@
 	if (fstream->autoclose_fd && _stream->fd != -1) {
 		if (close(_stream->fd) < 0)
 			i_error("file_istream.close() failed: %m");
-		_stream->fd = -1;
 	}
+	_stream->fd = -1;
 }
 
 static void _destroy(struct _iostream *stream)
--- a/src/lib/istream-mmap.c	Tue Nov 07 15:57:30 2006 +0200
+++ b/src/lib/istream-mmap.c	Tue Nov 07 15:58:56 2006 +0200
@@ -30,8 +30,8 @@
 	if (mstream->autoclose_fd && mstream->istream.fd != -1) {
 		if (close(mstream->istream.fd) < 0)
 			i_error("mmap_istream.close() failed: %m");
-		mstream->istream.fd = -1;
 	}
+	mstream->istream.fd = -1;
 }
 
 static void i_stream_munmap(struct mmap_istream *mstream)
--- a/src/lib/ostream-file.c	Tue Nov 07 15:57:30 2006 +0200
+++ b/src/lib/ostream-file.c	Tue Nov 07 15:58:56 2006 +0200
@@ -57,8 +57,8 @@
 	if (fstream->autoclose_fd && fstream->fd != -1) {
 		if (close(fstream->fd) < 0)
 			i_error("file_ostream.close() failed: %m");
-		fstream->fd = -1;
 	}
+	fstream->fd = -1;
 
 	fstream->ostream.ostream.closed = TRUE;
 }