Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conversion to wstring / PRUnichar

Browse Source 
some cosmetics to various Makefiles


git-svn-id: svn://10.0.0.236/trunk@34798 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
andreas.otte%primus-online.de
1999-06-11 15:50:14 +00:00
parent c035592fb5
commit 891f537f8e
38 changed files with 118 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/netwerk/Makefile.in
View File

@@ -15,13 +15,12 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
include $(DEPTH)/config/autoconf.mk

3
mozilla/netwerk/base/public/nsIProgressEventSink.idl
View File

@@ -19,7 +19,6 @@
#include "nsISupports.idl"
interface nsIURI;
interface nsIString;
/**
* An instance of nsIFfpEventSink should be passed as the eventSink
@@ -39,6 +38,6 @@ interface nsIProgressEventSink : nsISupports
/**
* Notify the EventSink with a status message for the URL load.<BR>
*/
void OnStatus(in nsISupports ctxt, in nsIString aMsg);
void OnStatus(in nsISupports ctxt, in wstring aMsg);
};

16
mozilla/netwerk/base/public/nsIPrompt.idl
View File

@@ -18,19 +18,17 @@
#include "nsISupports.idl"
interface nsIString;
[scriptable, uuid(a63f70c0-148b-11d3-9333-00104ba0fd40)]
interface nsIPrompt : nsISupports
{
boolean Confirm(in nsISupports ctxt, in nsIString text);
boolean Confirm(in nsISupports ctxt, in wstring text);
boolean Prompt(in nsISupports ctxt, in nsIString text,
in nsIString defaultText, out nsIString result);
boolean Prompt(in nsISupports ctxt, in wstring text,
in wstring defaultText, out wstring result);
boolean PromptUsernameAndPassword(in nsISupports ctxt, in nsIString text,
out nsIString user, out nsIString pwd);
boolean PromptUsernameAndPassword(in nsISupports ctxt, in wstring text,
out wstring user, out wstring pwd);
boolean PromptPassword(in nsISupports ctxt, in nsIString text,
out nsIString pwd);
boolean PromptPassword(in nsISupports ctxt, in wstring text,
out wstring pwd);
};

5
mozilla/netwerk/base/public/nsIStreamObserver.idl
View File

@@ -18,7 +18,6 @@
#include "nsISupports.idl"
interface nsIString;
interface nsIEventQueue;
[scriptable, uuid(fd91e2e0-1481-11d3-9333-00104ba0fd40)]
@@ -28,7 +27,7 @@ interface nsIStreamObserver : nsISupports
void OnStopBinding(in nsISupports ctxt,
in nsresult status,
in nsIString errorMsg);
in wstring errorMsg);
/**
* Called after the stream is opened for reading or writing.
@@ -39,7 +38,7 @@ interface nsIStreamObserver : nsISupports
void OnStopRequest(in nsISupports ctxt,
in nsresult status,
in nsIString errorMsg);
in wstring errorMsg);
};
%{C++

32
mozilla/netwerk/base/src/nsAsyncStreamListener.cpp
View File

@@ -19,7 +19,7 @@
#include "nsIStreamObserver.h"
#include "nsIStreamListener.h"
#include "nsIBufferInputStream.h"
#include "nsIString.h"
#include "nsString.h"
#include "nsCRT.h"
#include "nsIEventQueue.h"
@@ -32,11 +32,11 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context);
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
// nsAsyncStreamObserver methods:
nsAsyncStreamObserver(nsIEventQueue* aEventQ)
@@ -59,7 +59,7 @@ public:
void SetStatus(nsresult value) { mStatus = value; }
protected:
nsIEventQueue* mEventQueue;
nsIEventQueue* mEventQueue;
nsIStreamObserver* mReceiver;
nsresult mStatus;
};
@@ -79,7 +79,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
return nsAsyncStreamObserver::OnStopBinding(context, aStatus, aMsg);
}
@@ -91,7 +91,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
return nsAsyncStreamObserver::OnStopRequest(context, aStatus, aMsg);
}
@@ -262,25 +262,23 @@ public:
mStatus(NS_OK), mMessage(nsnull) {}
virtual ~nsOnStopBindingEvent();
nsresult Init(nsresult status, nsIString* aMsg);
nsresult Init(nsresult status, PRUnichar* aMsg);
NS_IMETHOD HandleEvent();
protected:
nsresult mStatus;
nsIString* mMessage;
PRUnichar* mMessage;
};
nsOnStopBindingEvent::~nsOnStopBindingEvent()
{
NS_IF_RELEASE(mMessage);
}
nsresult
nsOnStopBindingEvent::Init(nsresult status, nsIString* aMsg)
nsOnStopBindingEvent::Init(nsresult status, PRUnichar* aMsg)
{
mStatus = status;
mMessage = aMsg;
NS_IF_ADDREF(mMessage);
return NS_OK;
}
@@ -294,7 +292,7 @@ nsOnStopBindingEvent::HandleEvent()
NS_IMETHODIMP
nsAsyncStreamObserver::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
nsresult rv = GetStatus();
if (NS_FAILED(rv)) return rv;
@@ -383,25 +381,23 @@ public:
mStatus(NS_OK), mMessage(nsnull) {}
virtual ~nsOnStopRequestEvent();
nsresult Init(nsresult status, nsIString* aMsg);
nsresult Init(nsresult status, PRUnichar* aMsg);
NS_IMETHOD HandleEvent();
protected:
nsresult mStatus;
nsIString* mMessage;
PRUnichar* mMessage;
};
nsOnStopRequestEvent::~nsOnStopRequestEvent()
{
NS_IF_RELEASE(mMessage);
}
nsresult
nsOnStopRequestEvent::Init(nsresult status, nsIString* aMsg)
nsOnStopRequestEvent::Init(nsresult status, PRUnichar* aMsg)
{
mStatus = status;
mMessage = aMsg;
NS_IF_ADDREF(mMessage);
return NS_OK;
}
@@ -415,7 +411,7 @@ nsOnStopRequestEvent::HandleEvent()
NS_IMETHODIMP
nsAsyncStreamObserver::OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
nsresult rv = GetStatus();
if (NS_FAILED(rv)) return rv;

9
mozilla/netwerk/base/src/nsSyncStreamListener.cpp
View File

@@ -17,7 +17,6 @@
*/
#include "nsIStreamListener.h"
#include "nsIString.h"
#include "nsCRT.h"
#include "nsIBufferInputStream.h"
#include "nsIBufferOutputStream.h"
@@ -34,11 +33,11 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context);
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
// nsIStreamListener methods:
NS_IMETHOD OnDataAvailable(nsISupports* context,
@@ -105,7 +104,7 @@ nsSyncStreamListener::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
nsSyncStreamListener::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
// XXX what do we do with the status and error message?
return mOutputStream->Close();
@@ -120,7 +119,7 @@ nsSyncStreamListener::OnStartRequest(nsISupports* context)
NS_IMETHODIMP
nsSyncStreamListener::OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
// XXX what do we do with the status and error message?
return mOutputStream->Close();

5
mozilla/netwerk/dns/Makefile.in
View File

@@ -15,13 +15,12 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
include $(DEPTH)/config/autoconf.mk

1
mozilla/netwerk/dns/public/Makefile.in
View File

@@ -18,6 +18,7 @@
MODULE = netwerk
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

2
mozilla/netwerk/dns/src/Makefile.in
View File

@@ -13,8 +13,8 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

13
mozilla/netwerk/protocol/Makefile.in
View File

@@ -15,21 +15,20 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
include $(DEPTH)/config/autoconf.mk
DIRS= \
file \
ftp \
http \
DIRS= \
file \
ftp \
http \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
mozilla/netwerk/protocol/file/Makefile.in
View File

@@ -15,13 +15,12 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
include $(DEPTH)/config/autoconf.mk

3
mozilla/netwerk/protocol/file/public/Makefile.in
View File

@@ -18,13 +18,14 @@
MODULE = netwerk
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
XPIDL_MODULE = netwerk_file
XPIDLSRCS = \
XPIDLSRCS = \
nsIFileChannel.idl \
$(NULL)

6
mozilla/netwerk/protocol/file/src/Makefile.in
View File

@@ -13,12 +13,14 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
LIBRARY_NAME = fileprotocol
IS_COMPONENT = 1
@@ -33,8 +35,6 @@ CPPSRCS = \
REQUIRES = xpcom netwerk raptor
MODULE = netwerk
include $(topsrcdir)/config/config.mk
TARGET = $(LIBARY)

5
mozilla/netwerk/protocol/ftp/Makefile.in
View File

@@ -15,13 +15,12 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
include $(DEPTH)/config/autoconf.mk

2
mozilla/netwerk/protocol/ftp/src/Makefile.in
View File

@@ -13,8 +13,8 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

4
mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp
View File

@@ -238,7 +238,7 @@ nsFTPChannel::OnStartBinding(nsISupports* context) {
NS_IMETHODIMP
nsFTPChannel::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
// Release the lock so the user get's the data stream
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -251,7 +251,7 @@ nsFTPChannel::OnStartRequest(nsISupports* context) {
NS_IMETHODIMP
nsFTPChannel::OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
// Release the lock so the user get's the data stream
return NS_ERROR_NOT_IMPLEMENTED;
}

4
mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h
View File

@@ -62,11 +62,11 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports *ctxt);
NS_IMETHOD OnStopRequest(nsISupports *ctxt,
nsresult status,
nsIString *errorMsg);
const PRUnichar *errorMsg);
// nsIStreamListener methods:
NS_IMETHOD OnDataAvailable(nsISupports* context,

4
mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
View File

@@ -184,7 +184,7 @@ nsFtpConnectionThread::Run() {
case FTP_ERROR:
{
// We have error'd out. Stop binding and pass the error back to the user.
nsIString* errorMsg = nsnull;
PRUnichar* errorMsg = nsnull;
nsFtpOnStopBindingEvent* event =
new nsFtpOnStopBindingEvent(mListener, nsnull);
if (!event)
@@ -1440,7 +1440,7 @@ nsFtpConnectionThread::FindGetState(void) {
}
nsresult
nsFtpConnectionThread::MapResultCodeToString(nsresult aResultCode, nsIString* *aOutMsg) {
nsFtpConnectionThread::MapResultCodeToString(nsresult aResultCode, PRUnichar* *aOutMsg) {
#if 0 // XXX waiting on NS_NewString() to make it's way into the builds (raptorbase.dll)
nsresult rv;
nsStr* string = nsnull;

3
mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.h
View File

@@ -22,7 +22,6 @@
#include "nsIStreamListener.h"
#include "nsIOutputStream.h"
#include "nsIURI.h"
#include "nsIString.h"
#include "nsString2.h"
#include "nsIEventQueue.h"
@@ -133,7 +132,7 @@ private:
void SetSystInternals(void);
FTP_STATE FindActionState(void);
FTP_STATE FindGetState(void);
nsresult MapResultCodeToString(nsresult aResultCode, nsIString* *aOutMsg);
nsresult MapResultCodeToString(nsresult aResultCode, PRUnichar* *aOutMsg);
// Private members

7
mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.cpp
View File

@@ -19,7 +19,6 @@
#include "nsFtpStreamListenerEvent.h"
#include "nsIBufferInputStream.h"
#include "nscore.h"
#include "nsIString.h"
nsFtpStreamListenerEvent::nsFtpStreamListenerEvent(nsIStreamListener* listener,
@@ -166,15 +165,13 @@ nsMarshalingStreamListener::OnDataAvailable(nsISupports* context,
nsFtpOnStopBindingEvent::~nsFtpOnStopBindingEvent()
{
NS_IF_RELEASE(mMessage);
}
nsresult
nsFtpOnStopBindingEvent::Init(nsresult status, nsIString* aMsg)
nsFtpOnStopBindingEvent::Init(nsresult status, PRUnichar* aMsg)
{
mStatus = status;
mMessage = aMsg;
NS_IF_ADDREF(mMessage);
return NS_OK;
}
@@ -188,7 +185,7 @@ nsFtpOnStopBindingEvent::HandleEvent()
NS_IMETHODIMP
nsMarshalingStreamObserver::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
nsresult rv = GetStatus();
if (NS_FAILED(rv)) return rv;

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

@@ -79,12 +79,12 @@ public:
mStatus(NS_OK), mMessage(nsnull) {}
virtual ~nsFtpOnStopBindingEvent();
nsresult Init(nsresult status, nsIString* aMsg);
nsresult Init(nsresult status, PRUnichar* aMsg);
NS_IMETHOD HandleEvent();
protected:
nsresult mStatus;
nsIString* mMessage;
PRUnichar* mMessage;
};
#endif // ___nsftpstreamlistener_h__

11
mozilla/netwerk/protocol/http/Makefile.in
View File

@@ -15,20 +15,19 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = netwerk
include $(DEPTH)/config/autoconf.mk
DIRS= \
public \
src \
DIRS= \
public \
src \
$(NULL)
include $(topsrcdir)/config/rules.mk

1
mozilla/netwerk/protocol/http/public/Makefile.in
View File

@@ -18,6 +18,7 @@
MODULE = netwerk
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

2
mozilla/netwerk/protocol/http/public/nsIHttpEventSink.h
View File

@@ -21,8 +21,6 @@
#include "nsIStreamListener.h"
class nsIString;
/*
The nsIHTTPEventSink class is the interface thru which the
HTTP handler reports specific http events back to a client.

6
mozilla/netwerk/protocol/http/src/Makefile.in
View File

@@ -13,8 +13,8 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@@ -35,6 +35,10 @@ CPPSRCS = \
nsHTTPResponse.cpp \
$(NULL)
EXPORTS= \
nsHTTPCID.h \
$(NULL)
REQUIRES = xpcom netwerk raptor
MODULE = netwerk

2
mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp
View File

@@ -25,7 +25,7 @@
#include "nsIChannel.h"
#include "nsIInputStream.h"
#include "nsIHTTPNotify.h"
#include "nsIHttpNotify.h"
#include "nsINetModRegEntry.h"
#include "nsProxyObjectManager.h"
#include "nsIServiceManager.h"

4
mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp
View File

@@ -901,7 +901,7 @@ nsHTTPRequest::OnStartBinding(nsISupports* i_pContext)
NS_IMETHODIMP
nsHTTPRequest::OnStopBinding(nsISupports* i_pContext,
nsresult iStatus,
nsIString* i_pMsg)
const PRUnichar* i_pMsg)
{
//printf("nsHTTPRequest::OnStopBinding...\n");
// if we could write successfully...
@@ -941,7 +941,7 @@ nsHTTPRequest::OnStartRequest(nsISupports* i_pContext)
NS_IMETHODIMP
nsHTTPRequest::OnStopRequest(nsISupports* i_pContext,
nsresult iStatus,
nsIString* i_pMsg)
const PRUnichar* i_pMsg)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

4
mozilla/netwerk/protocol/http/src/nsHTTPRequest.h
View File

@@ -241,9 +241,9 @@ public:
NS_IMETHOD OnStartBinding(nsISupports* context);
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports *ctxt);
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, nsIString *errorMsg);
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
// Finally our own methods...
/*

3
mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.cpp
View File

@@ -16,7 +16,6 @@
* Reserved.
*/
#include "nsIString.h"
#include "nsHTTPRequestObserver.h"
#include "nsHTTPResponseListener.h"
#include "nsIChannel.h"
@@ -47,7 +46,7 @@ nsHTTPRequestObserver::OnStartBinding(nsISupports* /*i_pContext*/)
NS_IMETHODIMP
nsHTTPRequestObserver::OnStopBinding(nsISupports* i_pContext,
nsresult iStatus,
nsIString* i_pMsg)
const PRUnichar* i_pMsg)
{
//printf("nsHTTPRequestObserver::OnStopBinding...\n");
// if we could write successfully...

3
mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.h
View File

@@ -21,7 +21,6 @@
#include "nsIStreamObserver.h"
class nsIChannel;
class nsIString;
/*
The nsHTTPRequestObserver class is the request writer observer that
@@ -56,7 +55,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
protected:

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

@@ -16,7 +16,6 @@
* Reserved.
*/
#include "nsIString.h"
#include "nsIStreamListener.h"
#include "nsHTTPResponseListener.h"
#include "nsIChannel.h"
@@ -27,7 +26,7 @@
#include "nsCRT.h"
#include "stdio.h" //sscanf
#include "nsIHTTPNotify.h"
#include "nsIHttpNotify.h"
#include "nsINetModRegEntry.h"
#include "nsProxyObjectManager.h"
#include "nsIServiceManager.h"
@@ -326,7 +325,7 @@ nsHTTPResponseListener::OnStartBinding(nsISupports* i_pContext)
NS_IMETHODIMP
nsHTTPResponseListener::OnStopBinding(nsISupports* i_pContext,
nsresult i_Status,
nsIString* i_pMsg)
const PRUnichar* i_pMsg)
{
//printf("nsHTTPResponseListener::OnStopBinding...\n");
//NS_ASSERTION(m_pResponse, "Response object not created yet or died?!");
@@ -350,7 +349,7 @@ nsHTTPResponseListener::OnStartRequest(nsISupports* i_pContext)
NS_IMETHODIMP
nsHTTPResponseListener::OnStopRequest(nsISupports* i_pContext,
nsresult iStatus,
nsIString* i_pMsg)
const PRUnichar* i_pMsg)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

5
mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h
View File

@@ -21,7 +21,6 @@
#include "nsIStreamListener.h"
class nsIChannel;
class nsIString;
class nsHTTPResponse;
class nsIHTTPChannel;
/*
@@ -62,9 +61,9 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports *ctxt);
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, nsIString *errorMsg);
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
protected:
PRBool m_bHeadersDone;

16
mozilla/netwerk/test/Makefile.in
View File

@@ -15,6 +15,7 @@
# Reserved.
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@@ -23,13 +24,13 @@ IGNORE_MANIFEST=1
include $(DEPTH)/config/autoconf.mk
CPPSRCS = \
TestSocketIO.cpp \
TestSocketInput.cpp \
TestSocketTransport.cpp \
TestFileInput.cpp \
TestProtocols.cpp \
$(NULL)
CPPSRCS = \
TestSocketIO.cpp \
TestSocketInput.cpp \
TestSocketTransport.cpp \
TestFileInput.cpp \
TestProtocols.cpp \
$(NULL)
BASE_LIBS = \
-lreg \
@@ -42,7 +43,6 @@ LIBS = \
$(NULL)
DEFINES += -DUSE_NSREG
INCLUDES += -I$(srcdir)/../public
REQUIRES=libreg xpcom

18
mozilla/netwerk/test/TestFileInput.cpp
View File

@@ -133,16 +133,12 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
nsresult rv;
PR_EnterMonitor(mMonitor);
if (aStatus == NS_OK) {
PRIntervalTime endTime = PR_IntervalNow();
gDuration += (endTime - mStartTime);
}
else {
printf("stop binding, %d\n", aStatus);
}
PRIntervalTime endTime = PR_IntervalNow();
gDuration += (endTime - mStartTime);
printf("stop binding, %d\n", aStatus);
PR_ExitMonitor(mMonitor);
// get me out of my event loop
@@ -158,7 +154,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -224,11 +220,13 @@ Simulated_nsFileTransport_Run(nsReader* reader, const char* path)
rv = NS_NewBufferInputStream(&bufStr, buf);
if (NS_FAILED(rv)) goto done;
/*
if ( spec.GetFileSize() == 0) goto done;
*/
while (PR_TRUE) {
PRUint32 amt;
/* id'l change to FillFrom... */
/* id'l change to FillFrom... */
rv = bufStr->FillFrom(fileStr, spec.GetFileSize(), &amt);
if (rv == NS_BASE_STREAM_EOF) {
rv = NS_OK;

6
mozilla/netwerk/test/TestProtocols.cpp
View File

@@ -85,7 +85,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context) {
return NS_ERROR_NOT_IMPLEMENTED;
@@ -93,7 +93,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -143,7 +143,7 @@ InputTestConsumer::OnDataAvailable(nsISupports* context,
NS_IMETHODIMP
InputTestConsumer::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
gKeepRunning = 0;
printf("\n+++ InputTestConsumer::OnStopBinding (status = %x) +++\n", aStatus);

12
mozilla/netwerk/test/TestSocketIO.cpp
View File

@@ -61,7 +61,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context) {
return NS_ERROR_NOT_IMPLEMENTED;
@@ -69,7 +69,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -119,7 +119,7 @@ InputTestConsumer::OnDataAvailable(nsISupports* context,
NS_IMETHODIMP
InputTestConsumer::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
gKeepRunning = 0;
printf("\n+++ InputTestConsumer::OnStopBinding (status = %x) +++\n", aStatus);
@@ -143,7 +143,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context) {
return NS_ERROR_NOT_IMPLEMENTED;
@@ -151,7 +151,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -188,7 +188,7 @@ TestWriteObserver::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
TestWriteObserver::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
printf("\n+++ TestWriteObserver::OnStopBinding (status = %x) +++\n", aStatus);

6
mozilla/netwerk/test/TestSocketInput.cpp
View File

@@ -54,7 +54,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context) {
return NS_ERROR_NOT_IMPLEMENTED;
@@ -62,7 +62,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -113,7 +113,7 @@ InputTestConsumer::OnDataAvailable(nsISupports* context,
NS_IMETHODIMP
InputTestConsumer::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
gKeepRunning = 0;
printf("+++ OnStopBinding +++\n");

12
mozilla/netwerk/test/TestSocketTransport.cpp
View File

@@ -131,7 +131,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context) {
return NS_ERROR_NOT_IMPLEMENTED;
@@ -139,7 +139,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -206,7 +206,7 @@ InputConsumer::OnDataAvailable(nsISupports* context,
NS_IMETHODIMP
InputConsumer::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
printf("\n+++ InputConsumer::OnStopBinding (status = %x) +++. Context = %p\n", aStatus, context);
mConnection->Lock();
@@ -237,7 +237,7 @@ public:
NS_IMETHOD OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg);
const PRUnichar* aMsg);
NS_IMETHOD OnStartRequest(nsISupports* context) {
return NS_ERROR_NOT_IMPLEMENTED;
@@ -245,7 +245,7 @@ public:
NS_IMETHOD OnStopRequest(nsISupports* context,
nsresult aStatus,
nsIString* aMsg) {
const PRUnichar* aMsg) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -282,7 +282,7 @@ OutputObserver::OnStartBinding(nsISupports* context)
NS_IMETHODIMP
OutputObserver::OnStopBinding(nsISupports* context,
nsresult aStatus,
nsIString* aMsg)
const PRUnichar* aMsg)
{
/// mConnection->Lock();