Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Miscellaneous fixes.

Browse Source
This commit is contained in:
gagan%netscape.com 1999-05-21 06:30:21 +00:00
parent 3887cf6de0
commit f99ba44b2a
8 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
netwerk/base/public/makefile.win
View File

@ -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>

6
netwerk/base/public/nsIHeader.h
View File

@ -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_

4
netwerk/base/public/nsINetService.h
View File

@ -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,

3
netwerk/base/public/nsIProtocolConnection.h
View File

@ -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;

8
netwerk/base/public/nsIProtocolHandler.h
View File

@ -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,

16
netwerk/base/src/nsNetService.cpp
View File

@ -28,6 +28,7 @@
#include "nsIFileTransportService.h"
#include "nsConnectionGroup.h"
#include <ctype.h> // 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<nsIProtocolHandler> 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;

4
netwerk/base/src/nsNetService.h
View File

@ -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,

1
netwerk/base/src/nsSyncStreamListener.cpp
View File

@ -20,6 +20,7 @@
#include "nsIByteBufferInputStream.h"
#include "nsIString.h"
#include "nsCRT.h"
#include "nsIOutputStream.h"
////////////////////////////////////////////////////////////////////////////////