If the close() is successful, set the fd to -1.

2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-stream-fs.c (stream_close): If the close() is successful,
	set the fd to -1.

	* camel-tcp-stream-raw.c: Removed the disconnect() method.
	(stream_close): If the close() is successful, set the sockfd to
	-1.

	* camel-tcp-stream-ssl.c: Removed the disconnect() method.
	(stream_close): If the close() is successful, set the sockfd to
	NULL.

	* camel-tcp-stream.c (camel_tcp_stream_disconnect): Removed,
	easier to just use the close() method as it did the same thing
	anyway.

svn path=/trunk/; revision=7522

1 files changed, 0 insertions, 27 deletions

diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
index d335cc7393..6edd545a1f 100644
--- a/camel/camel-tcp-stream.c
+++ b/camel/camel-tcp-stream.c
@@ -31,7 +31,6 @@ static CamelStreamClass *parent_class = NULL;
 #define CTS_CLASS(so) CAMEL_TCP_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
 
 static int tcp_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-static int tcp_disconnect (CamelTcpStream *stream);
 static int tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
 static int tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
 
@@ -45,7 +44,6 @@ camel_tcp_stream_class_init (CamelTcpStreamClass *camel_tcp_stream_class)
 	
 	/* tcp stream methods */
 	camel_tcp_stream_class->connect    = tcp_connect;
-	camel_tcp_stream_class->disconnect = tcp_disconnect;
 	camel_tcp_stream_class->getsockopt = tcp_getsockopt;
 	camel_tcp_stream_class->setsockopt = tcp_setsockopt;
 }
@@ -103,31 +101,6 @@ camel_tcp_stream_connect (CamelTcpStream *stream, struct hostent *host, int port
 
 
 static int
-tcp_disconnect (CamelTcpStream *stream)
-{
-	g_warning ("CamelTcpStream::disconnect called on default implementation\n");
-	return -1;
-}
-
-
-/**
- * camel_tcp_stream_disconnect:
- * @stream: tcp stream object
- *
- * Disconnect the tcp stream and properly close the socket.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_disconnect (CamelTcpStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->disconnect (stream);
-}
-
-
-static int
 tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
 {
 	g_warning ("CamelTcpStream::getsockopt called on default implementation\n");