From 822b09027a82700ba8981aeaa3bbf141ab4cb2ab Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Wed, 2 May 2001 00:17:16 +0000 Subject: [PATCH] removing ^M --- .../ftp/src/nsFtpConnectionThread.cpp | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index 8c0c7431a489..eeeda5fc38af 100644 --- a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -78,7 +78,7 @@ public: NS_DECL_NSIPROGRESSEVENTSINK NS_FORWARD_NSIREQUEST(mRequest->) - NS_FORWARD_NSICHANNEL(mFTPChannel->) + NS_FORWARD_NSICHANNEL(mFTPChannel->) NS_FORWARD_NSIFTPCHANNEL(mFTPChannel->) PRUint32 GetBytesTransfered() {return mBytesTransfered;} ; @@ -86,7 +86,7 @@ public: protected: nsCOMPtr mRequest; - nsCOMPtr mFTPChannel; + nsCOMPtr mFTPChannel; nsCOMPtr mListener; nsCOMPtr mEventSink; @@ -104,7 +104,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(DataRequestForwarder, nsIStreamListener, nsIRequestObserver, nsIFTPChannel, - nsIChannel, + nsIChannel, nsIRequest, nsIInterfaceRequestor, nsIProgressEventSink); @@ -149,7 +149,7 @@ DataRequestForwarder::Init(nsIRequest *request) mFTPChannel = do_QueryInterface(request); mEventSink = do_QueryInterface(request); mListener = do_QueryInterface(request); - + if (!mRequest || !mFTPChannel) return NS_ERROR_FAILURE; @@ -1138,10 +1138,10 @@ nsFtpState::S_list() { mResponseMsg = ""; return rv; } - - // the data forwarder defaults to sending notifications - // to the channel. Lets hijack and send the notifications - // to the stream converter. + + // the data forwarder defaults to sending notifications + // to the channel. Lets hijack and send the notifications + // to the stream converter. mDRequestForwarder->SetStreamListener(converter); nsCAutoString listString("LIST" CRLF); @@ -1592,15 +1592,15 @@ nsFtpState::Init(nsIFTPChannel* aChannel, rv = aChannel->GetURI(getter_AddRefs(mURL)); if (NS_FAILED(rv)) return rv; - - char *path = nsnull; - nsCOMPtr aURL(do_QueryInterface(mURL)); - - if (aURL) - rv = aURL->GetFilePath(&path); - else + + char *path = nsnull; + nsCOMPtr aURL(do_QueryInterface(mURL)); + + if (aURL) + rv = aURL->GetFilePath(&path); + else rv = mURL->GetPath(&path); - + if (NS_FAILED(rv)) return rv; mPath = nsUnescape(path); nsMemory::Free(path); @@ -1741,10 +1741,10 @@ nsFtpState::StopProcessing() { NS_ASSERTION(mPrompter, "no prompter!"); if (mPrompter) - (void) mPrompter->Alert(nsnull, text.GetUnicode()); -#if DEBUG - else - printf("NO ALERT! FTP error: %s", text.get()); + (void) mPrompter->Alert(nsnull, text.GetUnicode()); +#if DEBUG + else + printf("NO ALERT! FTP error: %s", text.get()); #endif }