2008-10-31 Gonzalo Paniagua Javier <gonzalo@novell.com>

[mono.git] / mcs / class / System / System.Net / FtpDataStream.cs

diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs
index 2418ed2dfecdd6fa3662c230d49e9afa479f5c1a..bc33e24c0d8c92b96f768c4372ce4080e27ef371 100644 (file)
--- a/mcs/class/System/System.Net/FtpDataStream.cs
+++ b/mcs/class/System/System.Net/FtpDataStream.cs
@@ -11,7 +11,7 @@ using System;
 using System.IO;
 using System.Net.Sockets;
 using System.Runtime.Remoting.Messaging;
-using System.Threading;\r
+using System.Threading;
 using System.Net;
 
 #if NET_2_0
@@ -25,7 +25,6 @@ namespace System.Net
                bool disposed;
                bool isRead;
                int totalRead;
-               int contentLength;
 
                ManualResetEvent closewh;
 
@@ -39,12 +38,11 @@ namespace System.Net
                                throw new ArgumentException ("socket");
 
                        this.request = request;
-                       this.contentLength = socket.Available;
                        this.networkStream = new NetworkStream (socket, true);
-                       this.isRead = isRead;\r
-\r
-                       if (request.EnableSsl) {\r
-                               FtpWebRequest.ChangeToSSLSocket (ref networkStream);\r
+                       this.isRead = isRead;
+
+                       if (request.EnableSsl) {
+                               FtpWebRequest.ChangeToSSLSocket (ref networkStream);
                        }
 
                        closewh = new ManualResetEvent (false);
@@ -91,11 +89,11 @@ namespace System.Net
                }
 
                public override void Close ()
-               {\r
-                       if (!disposed) {\r
-                               networkStream.Close ();\r
-                               request.SetTransferCompleted ();\r
-                               ((IDisposable) this).Dispose ();\r
+               {
+                       if (!disposed) {
+                               networkStream.Close ();
+                               request.SetTransferCompleted ();
+                               ((IDisposable) this).Dispose ();
                        }
                }
 
@@ -116,24 +114,23 @@ namespace System.Net
 
                int ReadInternal (byte [] buffer, int offset, int size)
                {
-                       int nbytes;\r
-\r
+                       int nbytes;
+
                        request.CheckIfAborted ();
 
                        try {
                                // Probably it would be better to have the socket here
-                               nbytes = networkStream.Read (buffer, offset, size);\r
+                               nbytes = networkStream.Read (buffer, offset, size);
                        } catch (IOException) {
                                throw new ProtocolViolationException ("Server commited a protocol violation");
                        }
 
-                       totalRead += nbytes;\r
-                       if (nbytes == 0) {\r
-                               contentLength = totalRead;\r
-                               request.SetTransferCompleted ();\r
-                               networkStream.Close ();\r
+                       totalRead += nbytes;
+                       if (nbytes == 0) {
+                               networkStream.Close ();
+                               request.SetTransferCompleted ();
                        }
-                       
+
                        return nbytes;
                }
 
@@ -171,8 +168,8 @@ namespace System.Net
                }
 
                public override int Read (byte [] buffer, int offset, int size)
-               {\r
-                       request.CheckIfAborted ();\r
+               {
+                       request.CheckIfAborted ();
                        IAsyncResult ar = BeginRead (buffer, offset, size, null, null);
                        if (!ar.IsCompleted && !ar.AsyncWaitHandle.WaitOne (request.ReadWriteTimeout, false))
                                throw new WebException ("Read timed out.", WebExceptionStatus.Timeout);
@@ -184,8 +181,8 @@ namespace System.Net
                delegate void WriteDelegate (byte [] buffer, int offset, int size);
                
                void WriteInternal (byte [] buffer, int offset, int size)
-               {\r
-                       request.CheckIfAborted ();\r
+               {
+                       request.CheckIfAborted ();
                        
                        try {
                                networkStream.Write (buffer, offset, size);
@@ -227,8 +224,8 @@ namespace System.Net
                }
 
                public override void Write (byte [] buffer, int offset, int size)
-               {\r
-                       request.CheckIfAborted ();\r
+               {
+                       request.CheckIfAborted ();
                        IAsyncResult ar = BeginWrite (buffer, offset, size, null, null);
                        if (!ar.IsCompleted && !ar.AsyncWaitHandle.WaitOne (request.ReadWriteTimeout, false))
                                throw new WebException ("Read timed out.", WebExceptionStatus.Timeout);