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

Added correct error codes and misc touch up.

Browse Source
This commit is contained in:
valeski%netscape.com 1999-05-09 19:24:37 +00:00
parent f1ec11c09c
commit 75be3509c9
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
netwerk/base/src/nsSocketTransport.cpp
View File

@ -657,8 +657,7 @@ nsSocketTransport::AsyncRead(nsISupports* aContext,
nsresult rv = NS_OK;
if (eSocketOperation_None != mOperation) {
// XXX: This should be NS_ERROR_IN_PROGRESS...
rv = NS_ERROR_FAILURE;
rv = NS_ERROR_IN_PROGRESS;
}
if (NS_SUCCEEDED(rv) && !mReadStream) {
@ -678,7 +677,7 @@ nsSocketTransport::AsyncRead(nsISupports* aContext,
if (NS_SUCCEEDED(rv)) {
mOperation = eSocketOperation_Read;
mService->AddToWorkQ(this);
rv = mService->AddToWorkQ(this);
}
return rv;
@ -694,8 +693,7 @@ nsSocketTransport::AsyncWrite(nsIInputStream* aFromStream,
nsresult rv = NS_OK;
if (eSocketOperation_None != mOperation) {
// XXX: This should be NS_ERROR_IN_PROGRESS...
rv = NS_ERROR_FAILURE;
rv = NS_ERROR_IN_PROGRESS;
}
if (NS_SUCCEEDED(rv)) {
@ -716,7 +714,7 @@ nsSocketTransport::AsyncWrite(nsIInputStream* aFromStream,
if (NS_SUCCEEDED(rv)) {
mOperation = eSocketOperation_Write;
mService->AddToWorkQ(this);
rv = mService->AddToWorkQ(this);
}
return rv;
@ -729,8 +727,7 @@ nsSocketTransport::OpenInputStream(nsIInputStream* *result)
nsresult rv = NS_OK;
if (eSocketOperation_None != mOperation) {
// XXX: This should be NS_ERROR_IN_PROGRESS...
rv = NS_ERROR_FAILURE;
rv = NS_ERROR_IN_PROGRESS;
}
if (NS_SUCCEEDED(rv) && !mReadStream) {
@ -749,26 +746,30 @@ nsSocketTransport::OpenInputStream(nsIInputStream* *result)
if (NS_SUCCEEDED(rv)) {
mOperation = eSocketOperation_Read;
mService->AddToWorkQ(this);
rv = mService->AddToWorkQ(this);
}
return rv;
}
static NS_DEFINE_IID(kIInputStreamIID, NS_IINPUTSTREAM_IID);
NS_IMETHODIMP
nsSocketTransport::OpenOutputStream(nsIOutputStream* *result)
{
nsresult rv = NS_OK;
if (eSocketOperation_None != mOperation) {
// XXX: This should be NS_ERROR_IN_PROGRESS...
rv = NS_ERROR_FAILURE;
rv = NS_ERROR_IN_PROGRESS;
}
if (NS_SUCCEEDED(rv) && !mWriteStream) {
// If we don't have a write stream at this point, get one!
if (!mWriteStream) {
// We want a pipe here so the caller can "write" into one end
// and the other end (aWriteStream) gets the data. This data
// is then written to the underlying socket when nsSocketTransport::doWrite()
// is called.
// XXX not sure if this should be blocking (PR_TRUE) or non-blocking.
rv = NS_NewPipe(&mWriteStream,
result,
PR_FALSE, MAX_IO_BUFFER_SIZE);
@ -776,9 +777,9 @@ nsSocketTransport::OpenOutputStream(nsIOutputStream* *result)
if (NS_SUCCEEDED(rv)) {
mOperation = eSocketOperation_Write;
mService->AddToWorkQ(this);
// Start the crank.
rv = mService->AddToWorkQ(this);
}
return rv;
}