Bug 632280 - Remove NS_NOTREACHED occurrences near nsCacheEntryDescriptor.cpp:686; r=bzbarsky,khuey a=bsmedberg
authorSean Dunn <seanedunn@yahoo.com>
Fri, 11 Feb 2011 16:49:07 -0500
changeset 62420 ee6b0aab1d3f9dd048aa58235908ba983e80297a
parent 62419 2a4dc060de2bcc01445af964318aeb7ab9338f8e
child 62421 6b6e30659dabbbc4d2cc232174700c11a985b69c
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky, khuey, bsmedberg
bugs632280
milestone2.0b12pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 632280 - Remove NS_NOTREACHED occurrences near nsCacheEntryDescriptor.cpp:686; r=bzbarsky,khuey a=bsmedberg
netwerk/cache/nsCacheEntryDescriptor.cpp
xpcom/io/nsStorageStream.cpp
--- a/netwerk/cache/nsCacheEntryDescriptor.cpp
+++ b/netwerk/cache/nsCacheEntryDescriptor.cpp
@@ -668,27 +668,25 @@ nsOutputStreamWrapper::Write(const char 
     return mOutput->Write(buf, count, result);
 }
 
 NS_IMETHODIMP nsCacheEntryDescriptor::
 nsOutputStreamWrapper::WriteFrom(nsIInputStream * inStr,
                                  PRUint32         count,
                                  PRUint32 *       result)
 {
-    NS_NOTREACHED("cache stream not buffered");
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsCacheEntryDescriptor::
 nsOutputStreamWrapper::WriteSegments(nsReadSegmentFun  reader,
                                      void *            closure,
                                      PRUint32          count,
                                      PRUint32 *        result)
 {
-    NS_NOTREACHED("cache stream not buffered");
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsCacheEntryDescriptor::
 nsOutputStreamWrapper::IsNonBlocking(PRBool *result)
 {
     // cache streams will never return NS_BASE_STREAM_WOULD_BLOCK
     *result = PR_FALSE;
--- a/xpcom/io/nsStorageStream.cpp
+++ b/xpcom/io/nsStorageStream.cpp
@@ -222,24 +222,22 @@ nsStorageStream::Write(const char *aBuff
     LOG(("nsStorageStream [%p] Wrote mWriteCursor=%x mSegmentEnd=%x numWritten=%d\n",
         this, mWriteCursor, mSegmentEnd, *aNumWritten));
     return rv;
 }
 
 NS_IMETHODIMP 
 nsStorageStream::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
 {
-    NS_NOTREACHED("WriteFrom");
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP 
 nsStorageStream::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
 {
-    NS_NOTREACHED("WriteSegments");
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP 
 nsStorageStream::IsNonBlocking(PRBool *aNonBlocking)
 {
     *aNonBlocking = PR_TRUE;
     return NS_OK;