diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-24 05:54:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 05:54:59 +0200 |
| commit | 81acc4099a515cc1b74ec2b0669aa85fe078aabc (patch) | |
| tree | f0e964257dca742f8fa1eae0d97dfcd7c7f50ec3 | |
| parent | e4836ec73a6abec1c1b78bb048c887006acca955 (diff) | |
| parent | e4cc27a0e791be3d504ed91355a9ea03711f2aa5 (diff) | |
| download | UXP-81acc4099a515cc1b74ec2b0669aa85fe078aabc.tar UXP-81acc4099a515cc1b74ec2b0669aa85fe078aabc.tar.gz UXP-81acc4099a515cc1b74ec2b0669aa85fe078aabc.tar.lz UXP-81acc4099a515cc1b74ec2b0669aa85fe078aabc.tar.xz UXP-81acc4099a515cc1b74ec2b0669aa85fe078aabc.zip | |
Merge pull request #847 from g4jc/debugspam
Don't use NS_ENSURE_SUCCESS where it causes useless logspam.
| -rw-r--r-- | netwerk/base/nsIOService.cpp | 4 | ||||
| -rw-r--r-- | netwerk/base/nsNetUtilInlines.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index e13541acf..435294315 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -789,7 +789,9 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, // creating a new channel by calling NewChannel(). if (NS_FAILED(rv)) { rv = handler->NewChannel(aURI, getter_AddRefs(channel)); - NS_ENSURE_SUCCESS(rv, rv); + if (NS_FAILED(rv)) { + return rv; + } // The protocol handler does not implement NewChannel2, so // maybe we need to wrap the channel (see comment in MaybeWrap // function). diff --git a/netwerk/base/nsNetUtilInlines.h b/netwerk/base/nsNetUtilInlines.h index 7003814d5..b831ec2e7 100644 --- a/netwerk/base/nsNetUtilInlines.h +++ b/netwerk/base/nsNetUtilInlines.h @@ -224,7 +224,9 @@ NS_NewChannelInternal(nsIChannel **outChannel, aUri, aLoadInfo, getter_AddRefs(channel)); - NS_ENSURE_SUCCESS(rv, rv); + if (NS_FAILED(rv)) { + return rv; + } if (aLoadGroup) { rv = channel->SetLoadGroup(aLoadGroup); |