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

nsIStreamListener::OnDataAvailable now takes a nsIInputStream instead of a nsIBufferInputStream.

Browse Source
This commit is contained in:
mscott%netscape.com 1999-06-28 20:37:10 +00:00
parent e3c37c950f
commit 5d01523ea0
21 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netwerk/base/public/nsIIOService.idl
View File

@ -26,6 +26,7 @@ interface nsIStreamObserver;
interface nsIStreamListener;
interface nsIEventQueue;
interface nsIBufferInputStream;
interface nsIInputStream;
interface nsIBufferOutputStream;
interface nsIFileChannel;
interface nsILoadGroup;
@ -123,7 +124,7 @@ interface nsIIOService : nsISupports
* A synchronous stream listener pushes data through a pipe that ends up
* in an input stream to be read by another thread.
*/
nsIStreamListener NewSyncStreamListener(out nsIBufferInputStream inStream,
nsIStreamListener NewSyncStreamListener(out nsIInputStream inStream,
out nsIBufferOutputStream outStream);
/**

5
netwerk/base/public/nsIStreamListener.idl
View File

@ -19,6 +19,7 @@
#include "nsIStreamObserver.idl"
interface nsIBufferInputStream;
interface nsIInputStream;
interface nsIBufferOutputStream;
interface nsIEventQueue;
@ -26,7 +27,7 @@ interface nsIEventQueue;
interface nsIStreamListener : nsIStreamObserver
{
void OnDataAvailable(in nsISupports ctxt,
in nsIBufferInputStream inStr,
in nsIInputStream inStr,
in unsigned long sourceOffset,
in unsigned long count);
};
@ -44,7 +45,7 @@ NS_NewAsyncStreamListener(nsIStreamListener* *result,
// A synchronous stream listener pushes data through a pipe that ends up
// in an input stream to be read by another thread.
extern NS_NET nsresult
NS_NewSyncStreamListener(nsIBufferInputStream **inStream,
NS_NewSyncStreamListener(nsIInputStream **inStream,
nsIBufferOutputStream **outStream,
nsIStreamListener **listener);

10
netwerk/base/src/nsAsyncStreamListener.cpp
View File

@ -97,7 +97,7 @@ public:
}
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -447,12 +447,12 @@ public:
mIStream(nsnull), mLength(0) {}
virtual ~nsOnDataAvailableEvent();
nsresult Init(nsIBufferInputStream* aIStream, PRUint32 aSourceOffset,
nsresult Init(nsIInputStream* aIStream, PRUint32 aSourceOffset,
PRUint32 aLength);
NS_IMETHOD HandleEvent();
protected:
nsIBufferInputStream* mIStream;
nsIInputStream* mIStream;
PRUint32 mSourceOffset;
PRUint32 mLength;
};
@ -463,7 +463,7 @@ nsOnDataAvailableEvent::~nsOnDataAvailableEvent()
}
nsresult
nsOnDataAvailableEvent::Init(nsIBufferInputStream* aIStream, PRUint32 aSourceOffset,
nsOnDataAvailableEvent::Init(nsIInputStream* aIStream, PRUint32 aSourceOffset,
PRUint32 aLength)
{
mSourceOffset = aSourceOffset;
@ -482,7 +482,7 @@ nsOnDataAvailableEvent::HandleEvent()
NS_IMETHODIMP
nsAsyncStreamListener::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength)
{

2
netwerk/base/src/nsFileTransport.cpp
View File

@ -216,7 +216,7 @@ nsFileTransport::OpenInputStream(PRUint32 startPosition, PRInt32 readCount,
NS_ASSERTION(startPosition == 0, "fix me");
nsIStreamListener* syncListener;
nsIBufferInputStream* inStr;
nsIInputStream* inStr;
rv = NS_NewSyncStreamListener(&syncListener, &inStr);
if (NS_FAILED(rv)) return rv;

2
netwerk/base/src/nsIOService.cpp
View File

@ -294,7 +294,7 @@ nsIOService::NewAsyncStreamListener(nsIStreamListener *receiver, nsIEventQueue *
}
NS_IMETHODIMP
nsIOService::NewSyncStreamListener(nsIBufferInputStream **inStream,
nsIOService::NewSyncStreamListener(nsIInputStream **inStream,
nsIBufferOutputStream **outStream,
nsIStreamListener **listener)
{

2
netwerk/base/src/nsIOService.h
View File

@ -50,7 +50,7 @@ public:
NS_IMETHOD GetUserAgent(PRUnichar* *aUserAgent);
NS_IMETHOD NewAsyncStreamObserver(nsIStreamObserver *receiver, nsIEventQueue *eventQueue, nsIStreamObserver **_retval);
NS_IMETHOD NewAsyncStreamListener(nsIStreamListener *receiver, nsIEventQueue *eventQueue, nsIStreamListener **_retval);
NS_IMETHOD NewSyncStreamListener(nsIBufferInputStream **inStream, nsIBufferOutputStream **outStream, nsIStreamListener **_retval);
NS_IMETHOD NewSyncStreamListener(nsIInputStream **inStream, nsIBufferOutputStream **outStream, nsIStreamListener **_retval);
NS_IMETHOD NewChannelFromNativePath(const char *nativePath, nsIFileChannel **_retval);
NS_IMETHOD NewLoadGroup(nsILoadGroup **result);

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

@ -41,7 +41,7 @@ public:
// nsIStreamListener methods:
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -52,7 +52,7 @@ public:
}
virtual ~nsSyncStreamListener();
nsresult Init(nsIBufferInputStream* *result);
nsresult Init(nsIInputStream* *result);
nsIBufferOutputStream* GetOutputStream() { return mOutputStream; }
@ -66,7 +66,7 @@ protected:
#define NS_SYNC_STREAM_LISTENER_BUFFER_SIZE (32 * 1024)
nsresult
nsSyncStreamListener::Init(nsIBufferInputStream* *result)
nsSyncStreamListener::Init(nsIInputStream* *result)
{
nsresult rv;
nsIBufferInputStream* in;
@ -133,7 +133,7 @@ nsSyncStreamListener::OnStopRequest(nsISupports* context,
NS_IMETHODIMP
nsSyncStreamListener::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength)
{
@ -151,7 +151,7 @@ nsSyncStreamListener::OnDataAvailable(nsISupports* context,
////////////////////////////////////////////////////////////////////////////////
NS_NET nsresult
NS_NewSyncStreamListener(nsIBufferInputStream **inStream,
NS_NewSyncStreamListener(nsIInputStream **inStream,
nsIBufferOutputStream **outStream,
nsIStreamListener **listener)
{

2
netwerk/protocol/ftp/src/nsFTPChannel.cpp
View File

@ -301,7 +301,7 @@ nsFTPChannel::OnStopRequest(nsISupports* context,
NS_IMETHODIMP
nsFTPChannel::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength) {
// Fill in the buffer w/ the new data.

2
netwerk/protocol/ftp/src/nsFTPChannel.h
View File

@ -76,7 +76,7 @@ public:
// nsIStreamListener methods:
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);

2
netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.cpp
View File

@ -115,7 +115,7 @@ nsFtpOnDataAvailableEvent::~nsFtpOnDataAvailableEvent()
}
nsresult
nsFtpOnDataAvailableEvent::Init(nsIBufferInputStream* aIStream,
nsFtpOnDataAvailableEvent::Init(nsIInputStream* aIStream,
PRUint32 aSourceOffset, PRUint32 aLength)
{
mLength = aLength;

4
netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.h
View File

@ -61,11 +61,11 @@ public:
mIStream(nsnull), mLength(0) {}
virtual ~nsFtpOnDataAvailableEvent();
nsresult Init(nsIBufferInputStream* aIStream, PRUint32 aSourceOffset, PRUint32 aLength);
nsresult Init(nsIInputStream* aIStream, PRUint32 aSourceOffset, PRUint32 aLength);
NS_IMETHOD HandleEvent();
protected:
nsIBufferInputStream* mIStream;
nsIInputStream* mIStream;
PRUint32 mSourceOffset;
PRUint32 mLength;
};

1
netwerk/protocol/http/src/nsHTTPRequest.h
View File

@ -28,6 +28,7 @@ class nsIInputStream;
class nsIURL;
class nsVoidArray;
class nsIBufferInputStream;
class nsIInputStream;
class nsIChannel;
class nsHTTPChannel;

7
netwerk/protocol/http/src/nsHTTPResponseListener.cpp
View File

@ -80,13 +80,14 @@ static NS_DEFINE_CID(kNetModuleMgrCID, NS_NETMODULEMGR_CID);
NS_IMETHODIMP
nsHTTPResponseListener::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *i_pStream,
nsIInputStream *i_pStream,
PRUint32 i_SourceOffset,
PRUint32 i_Length)
{
nsresult rv = NS_OK;
PRUint32 actualBytesRead;
NS_ASSERTION(i_pStream, "No stream supplied by the transport!");
nsCOMPtr<nsIBufferInputStream> bufferInStream = do_QueryInterface(i_pStream);
PR_LOG(gHTTPLog, PR_LOG_DEBUG,
("nsHTTPResponseListener::OnDataAvailable [this=%x].\n"
@ -96,7 +97,7 @@ nsHTTPResponseListener::OnDataAvailable(nsISupports* context,
if (!m_pResponse)
{
// why do I need the connection in the constructor... get rid.. TODO
m_pResponse = new nsHTTPResponse (i_pStream);
m_pResponse = new nsHTTPResponse (bufferInStream);
if (!m_pResponse) {
NS_ERROR("Failed to create the response object!");
return NS_ERROR_OUT_OF_MEMORY;
@ -110,7 +111,7 @@ nsHTTPResponseListener::OnDataAvailable(nsISupports* context,
if (!m_bHeadersDone) {
nsCOMPtr<nsIBuffer> pBuffer;
rv = i_pStream->GetBuffer(getter_AddRefs(pBuffer));
rv = bufferInStream->GetBuffer(getter_AddRefs(pBuffer));
if (NS_FAILED(rv)) return rv;
if (!m_bFirstLineParsed) {

2
netwerk/protocol/http/src/nsHTTPResponseListener.h
View File

@ -57,7 +57,7 @@ public:
// nsIStreamListener functions
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);

2
netwerk/test/TestFileInput.cpp
View File

@ -114,7 +114,7 @@ public:
}
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength) {
PR_EnterMonitor(mMonitor);

4
netwerk/test/TestProtocols.cpp
View File

@ -183,7 +183,7 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -247,7 +247,7 @@ InputTestConsumer::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
InputTestConsumer::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength)
{

4
netwerk/test/TestSocketIO.cpp
View File

@ -55,7 +55,7 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -100,7 +100,7 @@ InputTestConsumer::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
InputTestConsumer::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength)
{

4
netwerk/test/TestSocketInput.cpp
View File

@ -48,7 +48,7 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -93,7 +93,7 @@ InputTestConsumer::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
InputTestConsumer::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength)
{

4
netwerk/test/TestSocketTransport.cpp
View File

@ -125,7 +125,7 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -177,7 +177,7 @@ InputConsumer::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
InputConsumer::OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength)
{

4
netwerk/test/nettest.cpp
View File

@ -64,7 +64,7 @@ public:
// stream listener methods
NS_IMETHOD OnDataAvailable(nsISupports* context,
nsIBufferInputStream *aIStream,
nsIInputStream *aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength);
@ -99,7 +99,7 @@ TestConsumer::~TestConsumer()
}
NS_IMETHODIMP TestConsumer::OnDataAvailable(nsISupports *context,
nsIBufferInputStream* aIStream,
nsIInputStream* aIStream,
PRUint32 aSourceOffset,
PRUint32 aLength) {
PRUint32 len;

4
netwerk/util/src/nsNetStreamLoader.cpp
View File

@ -51,7 +51,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
// nsIStreamListener methods
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
#if 0
NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
@ -177,7 +177,7 @@ nsUnicharStreamLoader::GetBindInfo(nsIURI* aURL,
NS_IMETHODIMP
nsUnicharStreamLoader::OnDataAvailable(nsISupports *ctxt,
nsIBufferInputStream *inStr,
nsIInputStream *inStr,
PRUint32 sourceOffset, PRUint32 count)
{
nsresult rv = NS_OK;