Bug 815639 - mLocalFile in nsDiskCacheStream doesn't have to be in the class

netwerk/cache/nsDiskCacheStreams.cpp

@@ -678,18 +678,16 @@ nsDiskCacheStreamIO::OpenCacheFile(int flags, PRFileDesc ** fd)
 
     nsresult         rv;
     nsDiskCacheMap * cacheMap = mDevice->CacheMap();
+    nsCOMPtr<nsIFile>           localFile;
     
     rv = cacheMap->GetLocalFileForDiskCacheRecord(&mBinding->mRecord,
                                                   nsDiskCache::kData,
                                                   !!(flags & PR_CREATE_FILE),
-                                                  getter_AddRefs(mLocalFile));
+                                                  getter_AddRefs(localFile));
     if (NS_FAILED(rv))  return rv;
     
     // create PRFileDesc for input stream - the 00600 is just for consistency
-    rv = mLocalFile->OpenNSPRFileDesc(flags, 00600, fd);
+    return localFile->OpenNSPRFileDesc(flags, 00600, fd);
-    if (NS_FAILED(rv))  return rv;  // unable to open file
-
-    return NS_OK;
 }
 
 
@@ -784,7 +782,6 @@ nsDiskCacheStreamIO::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf)
 {
     size_t usage = aMallocSizeOf(this);
 
-    usage += aMallocSizeOf(mLocalFile);
     usage += aMallocSizeOf(mFD);
     usage += aMallocSizeOf(mBuffer);
 

netwerk/cache/nsDiskCacheStreams.h

@@ -70,7 +70,6 @@ private:
     nsDiskCacheDevice *         mDevice;
     nsDiskCacheOutputStream *   mOutStream;     // not an owning reference
     int32_t                     mInStreamCount;
-    nsCOMPtr<nsIFile>           mLocalFile;
     PRFileDesc *                mFD;
 
     uint32_t                    mStreamPos;     // for Output Streams