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

Removed nsCOMPtr breakage.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@41697 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com 1999-07-31 07:30:49 +00:00
parent 729039e874
commit d5517979e2
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/netwerk/base/src/nsInputStreamChannel.cpp
View File

@ -19,19 +19,23 @@
#include "nsInputStreamChannel.h"
#include "nsIStreamListener.h"
#include "nsILoadGroup.h"
#include "nsCOMPtr.h"
////////////////////////////////////////////////////////////////////////////////
// nsInputStreamChannel methods:
nsInputStreamChannel::nsInputStreamChannel()
: mContentType(nsnull)
: mURI(nsnull), mContentType(nsnull), mInputStream(nsnull), mLoadGroup(nsnull)
{
NS_INIT_REFCNT();
}
nsInputStreamChannel::~nsInputStreamChannel()
{
NS_IF_RELEASE(mURI);
if (mContentType) nsCRT::free(mContentType);
NS_IF_RELEASE(mInputStream);
NS_IF_RELEASE(mLoadGroup);
}
NS_METHOD
@ -51,11 +55,13 @@ nsresult
nsInputStreamChannel::Init(nsIURI* uri, const char* contentType,
nsIInputStream* in)
{
mURI = uri; // addrefs
mURI = uri;
NS_IF_ADDREF(mURI);
mContentType = nsCRT::strdup(contentType);
if (mContentType == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
mInputStream = in; // addrefs
mInputStream = in;
NS_IF_ADDREF(mInputStream);
return NS_OK;
}
@ -193,7 +199,9 @@ nsInputStreamChannel::GetLoadGroup(nsILoadGroup * *aLoadGroup)
NS_IMETHODIMP
nsInputStreamChannel::SetLoadGroup(nsILoadGroup * aLoadGroup)
{
mLoadGroup = aLoadGroup; // releases and addrefs
NS_IF_RELEASE(mLoadGroup);
mLoadGroup = aLoadGroup;
NS_IF_ADDREF(mLoadGroup);
return NS_OK;
}

9
mozilla/netwerk/base/src/nsInputStreamChannel.h
View File

@ -23,7 +23,6 @@
#include "nsIInputStream.h"
#include "nsIURI.h"
#include "nsCRT.h"
#include "nsCOMPtr.h"
class nsInputStreamChannel : public nsIChannel
{
@ -62,10 +61,10 @@ public:
nsresult Init(nsIURI* uri, const char* contentType, nsIInputStream* in);
protected:
nsCOMPtr<nsIURI> mURI;
char* mContentType;
nsCOMPtr<nsIInputStream> mInputStream;
nsCOMPtr<nsILoadGroup> mLoadGroup;
nsIURI* mURI;
char* mContentType;
nsIInputStream* mInputStream;
nsILoadGroup* mLoadGroup;
};
#define NS_INPUTSTREAMCHANNEL_CID \