From f99ba44b2a0389ea2dd5959f2a37e2c8634a2d81 Mon Sep 17 00:00:00 2001 From: "gagan%netscape.com" Date: Fri, 21 May 1999 06:30:21 +0000 Subject: [PATCH] Miscellaneous fixes. --- netwerk/base/public/makefile.win | 27 +++++++++++---------- netwerk/base/public/nsIHeader.h | 6 ++++- netwerk/base/public/nsINetService.h | 4 +-- netwerk/base/public/nsIProtocolConnection.h | 3 ++- netwerk/base/public/nsIProtocolHandler.h | 8 +++--- netwerk/base/src/nsNetService.cpp | 16 ++++++------ netwerk/base/src/nsNetService.h | 4 +-- netwerk/base/src/nsSyncStreamListener.cpp | 1 + 8 files changed, 39 insertions(+), 30 deletions(-) diff --git a/netwerk/base/public/makefile.win b/netwerk/base/public/makefile.win index df9bf8516813..a9c61f79871e 100644 --- a/netwerk/base/public/makefile.win +++ b/netwerk/base/public/makefile.win @@ -19,20 +19,21 @@ MODULE = netwerk DEPTH = ..\..\.. -EXPORTS = \ - nsICancelable.h \ - nsIConnectionGroup.h \ - nsIFileTransportService.h \ +EXPORTS = \ + netCore.h \ + nsICancelable.h \ + nsIConnectionGroup.h \ + nsIFileTransportService.h \ + nsIHeader.h \ + nsINetService.h \ + nsIProtocolConnection.h \ + nsIProtocolHandler.h \ + nsIProxy.h \ nsISocketTransportService.h \ - nsINetService.h \ - nsIProtocolConnection.h \ - nsIProtocolHandler.h \ - nsISocketTransportService.h \ - nsIStreamListener.h \ - nsIStreamObserver.h \ - nsITransport.h \ - nsIUrl.h \ - netCore.h \ + nsIStreamListener.h \ + nsIStreamObserver.h \ + nsITransport.h \ + nsIUrl.h \ $(NULL) include <$(DEPTH)/config/rules.mak> diff --git a/netwerk/base/public/nsIHeader.h b/netwerk/base/public/nsIHeader.h index 0e9c3e92c127..df9f4830796f 100644 --- a/netwerk/base/public/nsIHeader.h +++ b/netwerk/base/public/nsIHeader.h @@ -67,5 +67,9 @@ public: return NS_IHEADER_IID; } -} +}; + +//TODO verify error offsets! +#define NS_ERROR_NOT_FOUND NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 115); + #endif // _nsIHeader_h_ \ No newline at end of file diff --git a/netwerk/base/public/nsINetService.h b/netwerk/base/public/nsINetService.h index fb38f31f3a30..7b07f009b835 100644 --- a/netwerk/base/public/nsINetService.h +++ b/netwerk/base/public/nsINetService.h @@ -67,8 +67,8 @@ public: * on the resulting URL object to obtain a more specific type of URL. */ NS_IMETHOD NewUrl(const char* aSpec, - nsIUrl* aBaseUrl, - nsIUrl* *result) = 0; + nsIUrl* *result, + nsIUrl* aBaseUrl=0) = 0; NS_IMETHOD NewConnection(nsIUrl* url, nsISupports* eventSink, diff --git a/netwerk/base/public/nsIProtocolConnection.h b/netwerk/base/public/nsIProtocolConnection.h index 1f5039401a5c..927ff52725a9 100644 --- a/netwerk/base/public/nsIProtocolConnection.h +++ b/netwerk/base/public/nsIProtocolConnection.h @@ -41,10 +41,11 @@ public: NS_IMETHOD Open(void) = 0; +/* // Why should this be here? // can be called after Open // freed by caller with delete[] NS_IMETHOD GetContentType(char* *contentType) = 0; - +*/ // blocking: NS_IMETHOD GetInputStream(nsIInputStream* *result) = 0; diff --git a/netwerk/base/public/nsIProtocolHandler.h b/netwerk/base/public/nsIProtocolHandler.h index c836a94df5bd..52bfc824944e 100644 --- a/netwerk/base/public/nsIProtocolHandler.h +++ b/netwerk/base/public/nsIProtocolHandler.h @@ -39,13 +39,13 @@ class nsIProtocolHandler : public nsISupports public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPROTOCOLHANDLER_IID); - NS_IMETHOD GetScheme(const char* *result) = 0; + NS_IMETHOD GetScheme(const char* *result) const = 0; - NS_IMETHOD GetDefaultPort(PRInt32 *result) = 0; + NS_IMETHOD GetDefaultPort(PRInt32 *result) const = 0; NS_IMETHOD MakeAbsoluteUrl(const char* aSpec, nsIUrl* aBaseUrl, - char* *result) = 0; + char* *result) const = 0; /** * Makes a URL object that is suitable for loading by this protocol. @@ -55,7 +55,7 @@ public: */ NS_IMETHOD NewUrl(const char* aSpec, nsIUrl* aBaseUrl, - nsIUrl* *result) = 0; + nsIUrl* *result) const = 0; NS_IMETHOD NewConnection(nsIUrl* url, nsISupports* eventSink, diff --git a/netwerk/base/src/nsNetService.cpp b/netwerk/base/src/nsNetService.cpp index 815c15671c0c..ae14e250b87a 100644 --- a/netwerk/base/src/nsNetService.cpp +++ b/netwerk/base/src/nsNetService.cpp @@ -28,6 +28,7 @@ #include "nsIFileTransportService.h" #include "nsConnectionGroup.h" #include // for isalpha +#include "nsCOMPtr.h" static NS_DEFINE_CID(kFileTransportService, NS_FILETRANSPORTSERVICE_CID); static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID); @@ -148,24 +149,25 @@ nsNetService::MakeAbsoluteUrl(const char* aSpec, NS_IMETHODIMP nsNetService::NewUrl(const char* aSpec, - nsIUrl* aBaseUrl, - nsIUrl* *result) + nsIUrl* *result, + nsIUrl* aBaseUrl) { nsresult rv; char schemeBuf[MAX_SCHEME_LENGTH]; const char* scheme = schemeBuf; rv = GetScheme(aSpec, schemeBuf); if (NS_FAILED(rv)) { - rv = aBaseUrl->GetScheme(&scheme); + if (aBaseUrl) + rv = aBaseUrl->GetScheme(&scheme); if (NS_FAILED(rv)) return rv; } - nsIProtocolHandler* handler; - rv = GetProtocolHandler(scheme, &handler); + nsCOMPtr handler; + rv = GetProtocolHandler(scheme, getter_AddRefs(handler)); if (NS_FAILED(rv)) return rv; rv = handler->NewUrl(aSpec, aBaseUrl, result); - NS_RELEASE(handler); + //NS_RELEASE(handler); return rv; } @@ -243,7 +245,7 @@ nsresult NS_NewURL(nsIUrl** aInstancePtrResult, (nsISupports **)&inet); if (NS_FAILED(rv)) return rv; - rv = inet->NewUrl(aSpec, aBaseUrl, aInstancePtrResult); + rv = inet->NewUrl(aSpec, aInstancePtrResult, aBaseUrl); if (NS_FAILED(rv)) return rv; diff --git a/netwerk/base/src/nsNetService.h b/netwerk/base/src/nsNetService.h index 6920792946a3..d5e957039641 100644 --- a/netwerk/base/src/nsNetService.h +++ b/netwerk/base/src/nsNetService.h @@ -33,8 +33,8 @@ public: nsIUrl* aBaseUrl, char* *result); NS_IMETHOD NewUrl(const char* aSpec, - nsIUrl* aBaseUrl, - nsIUrl* *result); + nsIUrl* *result, + nsIUrl* aBaseUrl=0); NS_IMETHOD NewConnection(nsIUrl* url, nsISupports* eventSink, nsIConnectionGroup* group, diff --git a/netwerk/base/src/nsSyncStreamListener.cpp b/netwerk/base/src/nsSyncStreamListener.cpp index 022da5af7b34..715dcd6b3fd0 100644 --- a/netwerk/base/src/nsSyncStreamListener.cpp +++ b/netwerk/base/src/nsSyncStreamListener.cpp @@ -20,6 +20,7 @@ #include "nsIByteBufferInputStream.h" #include "nsIString.h" #include "nsCRT.h" +#include "nsIOutputStream.h" ////////////////////////////////////////////////////////////////////////////////