From 1093b35b11d0d350e481c1c0f575c6d8d0c2fc4b Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Tue, 13 Sep 2005 22:08:52 +0000 Subject: [PATCH] fixes bug 308369 "Stop copying stat cache when cloning nsIFile instances" r=josh sr=dougt git-svn-id: svn://10.0.0.236/trunk@180149 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsLocalFileOS2.cpp | 6 ++---- mozilla/xpcom/io/nsLocalFileUnix.cpp | 5 ++--- mozilla/xpcom/io/nsLocalFileWin.cpp | 9 +++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/mozilla/xpcom/io/nsLocalFileOS2.cpp b/mozilla/xpcom/io/nsLocalFileOS2.cpp index 233a3fd7ace..ac79cf53b90 100644 --- a/mozilla/xpcom/io/nsLocalFileOS2.cpp +++ b/mozilla/xpcom/io/nsLocalFileOS2.cpp @@ -580,9 +580,8 @@ char * TypeEaEnumerator::GetNext(PRUint32 *lth) //----------------------------------------------------------------------------- nsLocalFile::nsLocalFile() + : mDirty(PR_TRUE) { - MakeDirty(); - memset(&mFileInfo64, 0, sizeof(mFileInfo64)); } NS_METHOD @@ -617,9 +616,8 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsLocalFile, nsILocalFile, nsIFile, nsILocalFileOS //----------------------------------------------------------------------------- nsLocalFile::nsLocalFile(const nsLocalFile& other) - : mDirty(other.mDirty) + : mDirty(PR_TRUE) , mWorkingPath(other.mWorkingPath) - , mFileInfo64(other.mFileInfo64) { } diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index b43f162643a..381ce2a24d6 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -247,9 +247,8 @@ nsLocalFile::nsLocalFile() : } nsLocalFile::nsLocalFile(const nsLocalFile& other) - : mCachedStat(other.mCachedStat) - , mPath(other.mPath) - , mHaveCachedStat(other.mHaveCachedStat) + : mPath(other.mPath) + , mHaveCachedStat(PR_FALSE) { } diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp index 84c05767ee6..a9cce179ba7 100644 --- a/mozilla/xpcom/io/nsLocalFileWin.cpp +++ b/mozilla/xpcom/io/nsLocalFileWin.cpp @@ -450,10 +450,9 @@ NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator) //----------------------------------------------------------------------------- nsLocalFile::nsLocalFile() - : mFollowSymlinks(PR_FALSE) + : mDirty(PR_TRUE) + , mFollowSymlinks(PR_FALSE) { - MakeDirty(); - memset(&mFileInfo64, 0, sizeof(mFileInfo64)); } NS_METHOD @@ -488,11 +487,9 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsLocalFile, nsILocalFile, nsIFile, nsILocalFileWi //----------------------------------------------------------------------------- nsLocalFile::nsLocalFile(const nsLocalFile& other) - : mDirty(other.mDirty) + : mDirty(PR_TRUE) , mFollowSymlinks(other.mFollowSymlinks) , mWorkingPath(other.mWorkingPath) - , mResolvedPath(other.mResolvedPath) - , mFileInfo64(other.mFileInfo64) { }