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

Get rid of m_isSocketOpen variable. Rely on new transport Open method to determine if

Browse Source 
the transport needs opened. Release some more interfaces when we go away...
This commit is contained in:
mscott%netscape.com 1999-02-04 23:52:04 +00:00
parent 02cf4efc6c
commit ca38bf39ae
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mailnews/news/src/nsNNTPProtocol.cpp
View File

@ -274,6 +274,10 @@ nsNNTPProtocol::~nsNNTPProtocol()
if (m_offlineNewsState)
NS_RELEASE(m_offlineNewsState);
NS_IF_RELEASE(m_outputStream);
NS_IF_RELEASE(m_outputConsumer);
NS_IF_RELEASE(m_transport);
// free our local state
}
@ -360,7 +364,6 @@ void nsNNTPProtocol::Initialize(nsIURL * aURL, nsITransport * transportLayer)
m_articleNumber = 0;
m_originalContentLength = 0;
m_urlInProgress = PR_FALSE;
m_socketIsOpen = PR_FALSE;
}
PRInt32 nsNNTPProtocol::LoadURL(nsIURL * aURL)
@ -644,12 +647,13 @@ PRInt32 nsNNTPProtocol::LoadURL(nsIURL * aURL)
else
{
// our first state is a process state so drive the state machine...
if (m_socketIsOpen == PR_FALSE)
PRBool transportOpen = PR_FALSE;
m_transport->IsTransportOpen(&transportOpen);
if (transportOpen == PR_FALSE)
{
m_transport->LoadURL(m_runningURL);
m_socketIsOpen = PR_TRUE; // we only want to kick off the socket the first time we make the connection
m_transport->Open(m_runningURL); // opening the url will cause to get notified when the connection is established
}
else // the connection is already open so just process it...
else // the connection is already open so we should begin processing our new url...
status = ProcessNewsState(m_runningURL, nsnull, 0);
return status;
}
@ -4483,14 +4487,6 @@ PRInt32 nsNNTPProtocol::CloseConnection()
PR_FREEIF (m_cancelID);
PR_FREEIF (m_cancelFromHdr);
PR_FREEIF (m_cancelNewsgroups);
PR_FREEIF (m_cancelDistribution);
// if(cd->destroy_graph_progress)
// FE_GraphProgressDestroy(ce->window_id,
// ce->URL_s,
// cd->original_content_length,
// ce->bytes_received);
PR_FREEIF (m_cancelDistribution);
return(-1); /* all done */
}

3
mailnews/news/src/nsNNTPProtocol.h
View File

@ -255,9 +255,6 @@ private:
char *m_commandSpecificData;
char *m_searchData;
PRBool m_socketIsOpen; // mscott: we should look into keeping this state in the nsSocketTransport...
// I'm using it to make sure I open the socket the first time a URL is loaded into the connection
PRInt32 m_originalContentLength; /* the content length at the time of calling graph progress */
PRInt32 ProcessNewsState(nsIURL * url, nsIInputStream * inputStream, PRUint32 length);