From 8a512d43b3258213683a1f5618457720812a7a75 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Tue, 14 Sep 1999 04:36:16 +0000 Subject: [PATCH] Getting ready to turn on the new file transport. git-svn-id: svn://10.0.0.236/trunk@47279 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/nsFileTransport.cpp | 56 ++++++++++++++++++- mozilla/netwerk/base/src/nsFileTransport.h | 6 +- .../base/src/nsFileTransportService.cpp | 4 +- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/mozilla/netwerk/base/src/nsFileTransport.cpp b/mozilla/netwerk/base/src/nsFileTransport.cpp index b47893a3bd3..badb4df7996 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.cpp +++ b/mozilla/netwerk/base/src/nsFileTransport.cpp @@ -134,10 +134,10 @@ NS_IMETHODIMP nsFileTransport::QueryInterface(const nsIID& aIID, void** aInstancePtr) { NS_ASSERTION(aInstancePtr, "no instance pointer"); - if (aIID.Equals(NS_GET_IID(nsITransport)) || + if (aIID.Equals(NS_GET_IID(nsIChannel)) || aIID.Equals(NS_GET_IID(nsIRequest)) || aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = NS_STATIC_CAST(nsITransport*, this); + *aInstancePtr = NS_STATIC_CAST(nsIChannel*, this); NS_ADDREF_THIS(); return NS_OK; } @@ -752,3 +752,55 @@ nsFileTransport::OnEmpty(nsIPipe* pipe) } //////////////////////////////////////////////////////////////////////////////// +// other nsIChannel methods: +//////////////////////////////////////////////////////////////////////////////// + +NS_IMETHODIMP +nsFileTransport::GetURI(nsIURI * *aURI) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::SetLoadAttributes(nsLoadFlags aLoadAttributes) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::GetContentType(char * *aContentType) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::GetContentLength(PRInt32 *aContentLength) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::GetOwner(nsISupports * *aOwner) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::SetOwner(nsISupports * aOwner) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::GetLoadGroup(nsILoadGroup * *aLoadGroup) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/base/src/nsFileTransport.h b/mozilla/netwerk/base/src/nsFileTransport.h index 02e4d81351b..231c7d0f22b 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.h +++ b/mozilla/netwerk/base/src/nsFileTransport.h @@ -19,7 +19,7 @@ #ifndef nsFileTransport_h__ #define nsFileTransport_h__ -#include "nsITransport.h" +#include "nsIChannel.h" #include "nsIRunnable.h" #include "nsFileSpec.h" #include "prlock.h" @@ -35,14 +35,14 @@ class nsIBaseStream; class nsIBufferInputStream; class nsIBufferOutputStream; -class nsFileTransport : public nsITransport, +class nsFileTransport : public nsIChannel, public nsIRunnable, public nsIPipeObserver { public: NS_DECL_ISUPPORTS NS_DECL_NSIREQUEST - NS_DECL_NSITRANSPORT + NS_DECL_NSICHANNEL NS_DECL_NSIPIPEOBSERVER NS_DECL_NSIRUNNABLE diff --git a/mozilla/netwerk/base/src/nsFileTransportService.cpp b/mozilla/netwerk/base/src/nsFileTransportService.cpp index 43528b21372..764f2402f64 100644 --- a/mozilla/netwerk/base/src/nsFileTransportService.cpp +++ b/mozilla/netwerk/base/src/nsFileTransportService.cpp @@ -85,7 +85,7 @@ NS_IMETHODIMP nsFileTransportService::CreateTransport(nsFileSpec& spec, const char* command, nsIEventSinkGetter* getter, - nsITransport** result) + nsIChannel** result) { nsresult rv; nsFileTransport* trans = new nsFileTransport(); @@ -105,7 +105,7 @@ NS_IMETHODIMP nsFileTransportService::CreateTransportFromStream(nsIInputStream *fromStream, const char *command, nsIEventSinkGetter *getter, - nsITransport** result) + nsIChannel** result) { nsresult rv; nsFileTransport* trans = new nsFileTransport();