diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp index 0d6da82d266..7cf68967c90 100644 --- a/mozilla/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/chrome/src/nsChromeRegistry.cpp @@ -3009,7 +3009,7 @@ nsChromeRegistry::CheckForNewChrome() rv = allPkgs->Append(kAllPackagesName); if (NS_FAILED(rv)) return rv; nsInt64 allPkgsDate; - (void)allPkgs->GetLastModificationDate(&allPkgsDate.mValue); + (void)allPkgs->GetLastModificationTime(&allPkgsDate.mValue); nsCOMPtr allSkns; rv = listFile->Clone(getter_AddRefs(allSkns)); @@ -3017,7 +3017,7 @@ nsChromeRegistry::CheckForNewChrome() rv = allSkns->Append(kAllSkinsName); if (NS_FAILED(rv)) return rv; nsInt64 allSknsDate; - (void)allSkns->GetLastModificationDate(&allSknsDate.mValue); + (void)allSkns->GetLastModificationTime(&allSknsDate.mValue); nsCOMPtr allLocs; rv = listFile->Clone(getter_AddRefs(allLocs)); @@ -3025,12 +3025,12 @@ nsChromeRegistry::CheckForNewChrome() rv = allLocs->Append(kAllLocalesName); if (NS_FAILED(rv)) return rv; nsInt64 allLocsDate; - (void)allLocs->GetLastModificationDate(&allLocsDate.mValue); + (void)allLocs->GetLastModificationTime(&allLocsDate.mValue); rv = listFile->AppendRelativePath(kInstalledChromeFileName); if (NS_FAILED(rv)) return rv; nsInt64 listFileDate; - (void)listFile->GetLastModificationDate(&listFileDate.mValue); + (void)listFile->GetLastModificationTime(&listFileDate.mValue); if (listFileDate < allPkgsDate && listFileDate < allSknsDate && diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index d7e8016fd48..4c5b9e3b4af 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -499,7 +499,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, // if we failed to get a last modification date, then we don't // want to necessarily fail to create a document for this // file. Just don't set the last modified date on it... - rv = file->GetLastModificationDate(&modDate); + rv = file->GetLastModificationTime(&modDate); if (NS_SUCCEEDED(rv)) { PRExplodedTime prtime; char buf[100]; diff --git a/mozilla/extensions/inspector/resources/content/jsutil/system/file.js b/mozilla/extensions/inspector/resources/content/jsutil/system/file.js index 6df1367632b..49d202c3c20 100644 --- a/mozilla/extensions/inspector/resources/content/jsutil/system/file.js +++ b/mozilla/extensions/inspector/resources/content/jsutil/system/file.js @@ -529,7 +529,7 @@ dateModified : function () try { var fileInst = new JSFILE_FilePath(this.mPath); - var date = new Date(fileInst.lastModificationDate).toLocaleString(); + var date = new Date(fileInst.lastModificationTime).toLocaleString(); retval=date; } diff --git a/mozilla/extensions/python/xpcom/server/loader.py b/mozilla/extensions/python/xpcom/server/loader.py index 824f509e77c..c491c69038a 100644 --- a/mozilla/extensions/python/xpcom/server/loader.py +++ b/mozilla/extensions/python/xpcom/server/loader.py @@ -187,7 +187,7 @@ class PythonComponentLoader: if e_location is None: # No escaped key needed. e_location = registry_location key = self.registry.addSubtreeRaw(self.xpcom_registry_key, e_location) - self.registry.setLongLong(key, lastModValueName, nsIFile.lastModificationDate) + self.registry.setLongLong(key, lastModValueName, nsIFile.lastModificationTime) self.registry.setLongLong(key, fileSizeValueName, nsIFile.fileSize) def _hasChanged(self, registry_location, nsIFile): if self.registry is None: @@ -198,7 +198,7 @@ class PythonComponentLoader: e_location = registry_location try: key = self.registry.getSubtreeRaw(self.xpcom_registry_key, e_location) - if nsIFile.lastModificationDate != self.registry.getLongLong(key, lastModValueName): + if nsIFile.lastModificationTime != self.registry.getLongLong(key, lastModValueName): return 1 if nsIFile.fileSize != self.registry.getLongLong(key, fileSizeValueName): return 1 diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp index 11a26a0ccf7..484c14f92fb 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -628,7 +628,7 @@ mozJSComponentLoader::SetRegistryInfo(const char *registryLocation, PRInt64 modDate; - if (NS_FAILED(rv = component->GetLastModificationDate(&modDate)) || + if (NS_FAILED(rv = component->GetLastModificationTime(&modDate)) || NS_FAILED(rv = mRegistry->SetLongLong(key, JSlastModValueName, &modDate))) return rv; @@ -707,7 +707,7 @@ mozJSComponentLoader::HasChanged(const char *registryLocation, if (NS_FAILED(mRegistry->GetLongLong(key, JSlastModValueName, ®Time))) return PR_TRUE; - if (NS_FAILED(component->GetLastModificationDate(&lastTime)) || LL_NE(lastTime, regTime)) + if (NS_FAILED(component->GetLastModificationTime(&lastTime)) || LL_NE(lastTime, regTime)) return PR_TRUE; /* check file size */ diff --git a/mozilla/modules/libjar/nsJAR.cpp b/mozilla/modules/libjar/nsJAR.cpp index 79f26c2fa08..1841384cb63 100644 --- a/mozilla/modules/libjar/nsJAR.cpp +++ b/mozilla/modules/libjar/nsJAR.cpp @@ -852,7 +852,7 @@ nsJAR::RestoreModTime(nsZipItem *aItem, nsIFile *aExtractedFile) LL_I2L(conversion, PR_USEC_PER_MSEC); LL_DIV(newTime, prtime, conversion); // nsIFile needs usecs. - rv = aExtractedFile->SetLastModificationDate(newTime); + rv = aExtractedFile->SetLastModificationTime(newTime); } JAR_NULLFREE(timestr); diff --git a/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp b/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp index 96e5eda23b6..ea3eed237f4 100644 --- a/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp +++ b/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp @@ -357,7 +357,7 @@ nsDirectoryIndexStream::Read(char* aBuf, PRUint32 aCount, PRUint32* aReadCount) LL_L2I( fileInfoSize,fileSize ); PRInt64 tmpTime, fileInfoModifyTime; - rv = current->GetLastModificationDate( &tmpTime ); + rv = current->GetLastModificationTime( &tmpTime ); // Why does nsIFile give this back in milliseconds? LL_MUL(fileInfoModifyTime, tmpTime, PR_USEC_PER_MSEC); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp index 0d6da82d266..7cf68967c90 100644 --- a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp @@ -3009,7 +3009,7 @@ nsChromeRegistry::CheckForNewChrome() rv = allPkgs->Append(kAllPackagesName); if (NS_FAILED(rv)) return rv; nsInt64 allPkgsDate; - (void)allPkgs->GetLastModificationDate(&allPkgsDate.mValue); + (void)allPkgs->GetLastModificationTime(&allPkgsDate.mValue); nsCOMPtr allSkns; rv = listFile->Clone(getter_AddRefs(allSkns)); @@ -3017,7 +3017,7 @@ nsChromeRegistry::CheckForNewChrome() rv = allSkns->Append(kAllSkinsName); if (NS_FAILED(rv)) return rv; nsInt64 allSknsDate; - (void)allSkns->GetLastModificationDate(&allSknsDate.mValue); + (void)allSkns->GetLastModificationTime(&allSknsDate.mValue); nsCOMPtr allLocs; rv = listFile->Clone(getter_AddRefs(allLocs)); @@ -3025,12 +3025,12 @@ nsChromeRegistry::CheckForNewChrome() rv = allLocs->Append(kAllLocalesName); if (NS_FAILED(rv)) return rv; nsInt64 allLocsDate; - (void)allLocs->GetLastModificationDate(&allLocsDate.mValue); + (void)allLocs->GetLastModificationTime(&allLocsDate.mValue); rv = listFile->AppendRelativePath(kInstalledChromeFileName); if (NS_FAILED(rv)) return rv; nsInt64 listFileDate; - (void)listFile->GetLastModificationDate(&listFileDate.mValue); + (void)listFile->GetLastModificationTime(&listFileDate.mValue); if (listFileDate < allPkgsDate && listFileDate < allSknsDate && diff --git a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp index 048b239cbdd..1d6e128fdde 100644 --- a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -1338,7 +1338,7 @@ FileSystemDataSource::GetLastMod(nsIRDFResource *source, nsIRDFDate **aResult) } PRInt64 lastModDate; - if (NS_FAILED(rv = aFile->GetLastModificationDate(&lastModDate))) + if (NS_FAILED(rv = aFile->GetLastModificationTime(&lastModDate))) return(rv); // convert from milliseconds to seconds diff --git a/mozilla/xpcom/components/xcDll.cpp b/mozilla/xpcom/components/xcDll.cpp index 6ce5953af0b..91a682f71b1 100644 --- a/mozilla/xpcom/components/xcDll.cpp +++ b/mozilla/xpcom/components/xcDll.cpp @@ -243,7 +243,7 @@ nsDll::Sync() return NS_ERROR_FAILURE; // Populate m_modDate and m_size - nsresult rv = m_dllSpec->GetLastModificationDate(&m_modDate); + nsresult rv = m_dllSpec->GetLastModificationTime(&m_modDate); if (NS_FAILED(rv)) return rv; rv = m_dllSpec->GetFileSize(&m_size); return rv; @@ -281,7 +281,7 @@ nsDll::HasChanged() // If mod date has changed, then dll has changed PRInt64 currentDate; - nsresult rv = m_dllSpec->GetLastModificationDate(¤tDate); + nsresult rv = m_dllSpec->GetLastModificationTime(¤tDate); if (NS_FAILED(rv) || LL_NE(currentDate, m_modDate)) return PR_TRUE; diff --git a/mozilla/xpcom/io/nsFastLoadFile.cpp b/mozilla/xpcom/io/nsFastLoadFile.cpp index 43316a67932..b51d5036ca8 100644 --- a/mozilla/xpcom/io/nsFastLoadFile.cpp +++ b/mozilla/xpcom/io/nsFastLoadFile.cpp @@ -742,7 +742,7 @@ nsFastLoadFileReader::ReadFooter(nsFastLoadFooter *aFooter) return rv; PRInt64 currentMtime; - rv = file->GetLastModificationDate(¤tMtime); + rv = file->GetLastModificationTime(¤tMtime); if (NS_FAILED(rv)) return rv; @@ -1506,7 +1506,7 @@ nsFastLoadFileWriter::AddDependency(nsIFile* aFile) if (!tmp) return NS_ERROR_OUT_OF_MEMORY; entry->mString = NS_REINTERPRET_CAST(const char*, tmp); - rv = aFile->GetLastModificationDate(&entry->mLastModified); + rv = aFile->GetLastModificationTime(&entry->mLastModified); } return rv; } diff --git a/mozilla/xpcom/io/nsIFile.idl b/mozilla/xpcom/io/nsIFile.idl index 9f7f2d17b95..144ec280178 100644 --- a/mozilla/xpcom/io/nsIFile.idl +++ b/mozilla/xpcom/io/nsIFile.idl @@ -186,8 +186,8 @@ interface nsIFile : nsISupports * midnight (00:00:00), January 1, 1970 Greenwich Mean * Time (GMT). */ - attribute PRInt64 lastModificationDate; - attribute PRInt64 lastModificationDateOfLink; + attribute PRInt64 lastModificationTime; + attribute PRInt64 lastModificationTimeOfLink; /** * WARNING! On the Mac getting/setting the file size with nsIFile diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 6a1acdee80d..528bf2f59a3 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -406,7 +406,7 @@ static void MacintoshInitializeTime(void) gJanuaryFirst1970Seconds = 2082844800 + GMTDelta(); } -static nsresult ConvertMacTimeToMilliseconds( PRInt64* aLastModificationDate, PRUint32 timestamp ) +static nsresult ConvertMacTimeToMilliseconds( PRInt64* aLastModificationTime, PRUint32 timestamp ) { if ( gJanuaryFirst1970Seconds == 0) MacintoshInitializeTime(); @@ -414,7 +414,7 @@ static nsresult ConvertMacTimeToMilliseconds( PRInt64* aLastModificationDate, PR PRTime usecPerSec, dateInMicroSeconds; LL_I2L(dateInMicroSeconds, timestamp); LL_I2L(usecPerSec, PR_MSEC_PER_SEC); - LL_MUL(*aLastModificationDate, usecPerSec, dateInMicroSeconds); + LL_MUL(*aLastModificationTime, usecPerSec, dateInMicroSeconds); return NS_OK; } @@ -1859,9 +1859,9 @@ nsLocalFile::Remove(PRBool recursive) } NS_IMETHODIMP -nsLocalFile::GetLastModificationDate(PRInt64 *aLastModificationDate) +nsLocalFile::GetLastModificationTime(PRInt64 *aLastModificationTime) { - NS_ENSURE_ARG(aLastModificationDate); + NS_ENSURE_ARG(aLastModificationTime); nsresult rv = ResolveAndStat( PR_TRUE ); if ( NS_FAILED( rv ) ) return rv; @@ -1873,11 +1873,11 @@ nsLocalFile::GetLastModificationDate(PRInt64 *aLastModificationDate) else timestamp = 0; - return ConvertMacTimeToMilliseconds( aLastModificationDate, timestamp ); + return ConvertMacTimeToMilliseconds( aLastModificationTime, timestamp ); } NS_IMETHODIMP -nsLocalFile::SetLastModificationDate(PRInt64 aLastModificationDate) +nsLocalFile::SetLastModificationTime(PRInt64 aLastModificationTime) { MakeDirty(); nsresult rv = ResolveAndStat( PR_TRUE ); @@ -1889,7 +1889,7 @@ nsLocalFile::SetLastModificationDate(PRInt64 aLastModificationDate) OSErr err = noErr; PRBool bIsDir = PR_FALSE; - ConvertMillisecondsToMacTime(aLastModificationDate, &macTime); + ConvertMillisecondsToMacTime(aLastModificationTime, &macTime); rv = IsDirectory(&bIsDir); if ( NS_FAILED(rv) ) return rv; @@ -1917,18 +1917,18 @@ nsLocalFile::SetLastModificationDate(PRInt64 aLastModificationDate) } NS_IMETHODIMP -nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModificationDate) +nsLocalFile::GetLastModificationTimeOfLink(PRInt64 *aLastModificationTime) { - NS_ENSURE_ARG(aLastModificationDate); + NS_ENSURE_ARG(aLastModificationTime); - *aLastModificationDate = LL_Zero(); + *aLastModificationTime = LL_Zero(); NS_ASSERTION(0, "Not implemented"); return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP -nsLocalFile::SetLastModificationDateOfLink(PRInt64 aLastModificationDate) +nsLocalFile::SetLastModificationTimeOfLink(PRInt64 aLastModificationTime) { MakeDirty(); diff --git a/mozilla/xpcom/io/nsLocalFileOS2.cpp b/mozilla/xpcom/io/nsLocalFileOS2.cpp index 990d47307af..611db4f3cef 100644 --- a/mozilla/xpcom/io/nsLocalFileOS2.cpp +++ b/mozilla/xpcom/io/nsLocalFileOS2.cpp @@ -1317,11 +1317,11 @@ nsLocalFile::Remove(PRBool recursive) } NS_IMETHODIMP -nsLocalFile::GetLastModificationDate(PRInt64 *aLastModificationDate) +nsLocalFile::GetLastModificationTime(PRInt64 *aLastModificationTime) { - NS_ENSURE_ARG(aLastModificationDate); + NS_ENSURE_ARG(aLastModificationTime); - *aLastModificationDate = 0; + *aLastModificationTime = 0; nsresult rv = ResolveAndStat(PR_TRUE); @@ -1329,17 +1329,17 @@ nsLocalFile::GetLastModificationDate(PRInt64 *aLastModificationDate) return rv; // microseconds -> milliseconds - *aLastModificationDate = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; + *aLastModificationTime = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; return NS_OK; } NS_IMETHODIMP -nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModificationDate) +nsLocalFile::GetLastModificationTimeOfLink(PRInt64 *aLastModificationTime) { - NS_ENSURE_ARG(aLastModificationDate); + NS_ENSURE_ARG(aLastModificationTime); - *aLastModificationDate = 0; + *aLastModificationTime = 0; nsresult rv = ResolveAndStat(PR_FALSE); @@ -1347,27 +1347,27 @@ nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModificationDate) return rv; // microseconds -> milliseconds - *aLastModificationDate = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; + *aLastModificationTime = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; return NS_OK; } NS_IMETHODIMP -nsLocalFile::SetLastModificationDate(PRInt64 aLastModificationDate) +nsLocalFile::SetLastModificationTime(PRInt64 aLastModificationTime) { - return nsLocalFile::SetModDate(aLastModificationDate, PR_TRUE); + return nsLocalFile::SetModDate(aLastModificationTime, PR_TRUE); } NS_IMETHODIMP -nsLocalFile::SetLastModificationDateOfLink(PRInt64 aLastModificationDate) +nsLocalFile::SetLastModificationTimeOfLink(PRInt64 aLastModificationTime) { - return nsLocalFile::SetModDate(aLastModificationDate, PR_FALSE); + return nsLocalFile::SetModDate(aLastModificationTime, PR_FALSE); } nsresult -nsLocalFile::SetModDate(PRInt64 aLastModificationDate, PRBool resolveTerminal) +nsLocalFile::SetModDate(PRInt64 aLastModificationTime, PRBool resolveTerminal) { nsresult rv = ResolveAndStat(resolveTerminal); @@ -1409,7 +1409,7 @@ nsLocalFile::SetModDate(PRInt64 aLastModificationDate, PRBool resolveTerminal) } // PR_ExplodeTime expects usecs... - PR_ExplodeTime(aLastModificationDate * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); + PR_ExplodeTime(aLastModificationTime * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); pathInfo.fdateLastWrite.year = pret.tm_year; pathInfo.fdateLastWrite.month = pret.tm_month + 1; // Convert start offset -- Win32: Jan=1; NSPR: Jan=0 // ???? OS2TODO st.wDayOfWeek = pret.tm_wday; @@ -1436,7 +1436,7 @@ nsLocalFile::SetModDate(PRInt64 aLastModificationDate, PRBool resolveTerminal) PRExplodedTime pret; // PR_ExplodeTime expects usecs... - PR_ExplodeTime(aLastModificationDate * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); + PR_ExplodeTime(aLastModificationTime * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); st.wYear = pret.tm_year; st.wMonth = pret.tm_month + 1; // Convert start offset -- Win32: Jan=1; NSPR: Jan=0 st.wDayOfWeek = pret.tm_wday; diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index 071394d2c47..c954b8265bb 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -904,7 +904,7 @@ nsLocalFile::Remove(PRBool recursive) } NS_IMETHODIMP -nsLocalFile::GetLastModificationDate(PRInt64 *aLastModTime) +nsLocalFile::GetLastModificationTime(PRInt64 *aLastModTime) { CHECK_mPath(); NS_ENSURE_ARG(aLastModTime); @@ -922,7 +922,7 @@ nsLocalFile::GetLastModificationDate(PRInt64 *aLastModTime) } NS_IMETHODIMP -nsLocalFile::SetLastModificationDate(PRInt64 aLastModTime) +nsLocalFile::SetLastModificationTime(PRInt64 aLastModTime) { CHECK_mPath(); @@ -945,7 +945,7 @@ nsLocalFile::SetLastModificationDate(PRInt64 aLastModTime) } NS_IMETHODIMP -nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModTimeOfLink) +nsLocalFile::GetLastModificationTimeOfLink(PRInt64 *aLastModTimeOfLink) { CHECK_mPath(); NS_ENSURE_ARG(aLastModTimeOfLink); @@ -967,9 +967,9 @@ nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModTimeOfLink) * utime(2) may or may not dereference symlinks, joy. */ NS_IMETHODIMP -nsLocalFile::SetLastModificationDateOfLink(PRInt64 aLastModTimeOfLink) +nsLocalFile::SetLastModificationTimeOfLink(PRInt64 aLastModTimeOfLink) { - return SetLastModificationDate(aLastModTimeOfLink); + return SetLastModificationTime(aLastModTimeOfLink); } /* diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp index b4e4b72a29b..17091468927 100644 --- a/mozilla/xpcom/io/nsLocalFileWin.cpp +++ b/mozilla/xpcom/io/nsLocalFileWin.cpp @@ -1211,11 +1211,11 @@ nsLocalFile::Remove(PRBool recursive) } NS_IMETHODIMP -nsLocalFile::GetLastModificationDate(PRInt64 *aLastModificationDate) +nsLocalFile::GetLastModificationTime(PRInt64 *aLastModificationTime) { - NS_ENSURE_ARG(aLastModificationDate); + NS_ENSURE_ARG(aLastModificationTime); - *aLastModificationDate = 0; + *aLastModificationTime = 0; nsresult rv = ResolveAndStat(PR_TRUE); @@ -1223,17 +1223,17 @@ nsLocalFile::GetLastModificationDate(PRInt64 *aLastModificationDate) return rv; // microseconds -> milliseconds - *aLastModificationDate = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; + *aLastModificationTime = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; return NS_OK; } NS_IMETHODIMP -nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModificationDate) +nsLocalFile::GetLastModificationTimeOfLink(PRInt64 *aLastModificationTime) { - NS_ENSURE_ARG(aLastModificationDate); + NS_ENSURE_ARG(aLastModificationTime); - *aLastModificationDate = 0; + *aLastModificationTime = 0; nsresult rv = ResolveAndStat(PR_FALSE); @@ -1241,27 +1241,27 @@ nsLocalFile::GetLastModificationDateOfLink(PRInt64 *aLastModificationDate) return rv; // microseconds -> milliseconds - *aLastModificationDate = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; + *aLastModificationTime = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; return NS_OK; } NS_IMETHODIMP -nsLocalFile::SetLastModificationDate(PRInt64 aLastModificationDate) +nsLocalFile::SetLastModificationTime(PRInt64 aLastModificationTime) { - return nsLocalFile::SetModDate(aLastModificationDate, PR_TRUE); + return nsLocalFile::SetModDate(aLastModificationTime, PR_TRUE); } NS_IMETHODIMP -nsLocalFile::SetLastModificationDateOfLink(PRInt64 aLastModificationDate) +nsLocalFile::SetLastModificationTimeOfLink(PRInt64 aLastModificationTime) { - return nsLocalFile::SetModDate(aLastModificationDate, PR_FALSE); + return nsLocalFile::SetModDate(aLastModificationTime, PR_FALSE); } nsresult -nsLocalFile::SetModDate(PRInt64 aLastModificationDate, PRBool resolveTerminal) +nsLocalFile::SetModDate(PRInt64 aLastModificationTime, PRBool resolveTerminal) { nsresult rv = ResolveAndStat(resolveTerminal); @@ -1290,7 +1290,7 @@ nsLocalFile::SetModDate(PRInt64 aLastModificationDate, PRBool resolveTerminal) PRExplodedTime pret; // PR_ExplodeTime expects usecs... - PR_ExplodeTime(aLastModificationDate * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); + PR_ExplodeTime(aLastModificationTime * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); st.wYear = pret.tm_year; st.wMonth = pret.tm_month + 1; // Convert start offset -- Win32: Jan=1; NSPR: Jan=0 st.wDayOfWeek = pret.tm_wday; diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp index 0c640f14985..c94e906c652 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp @@ -707,7 +707,7 @@ xptiInterfaceInfoManager::DetermineAutoRegStrategy(nsISupportsArray* aSearchPath PRUint32 directory; if(NS_FAILED(file->GetFileSize(&size)) || - NS_FAILED(file->GetLastModificationDate(&date)) || + NS_FAILED(file->GetLastModificationTime(&date)) || NS_FAILED(file->GetLeafName(getter_Copies(name))) || !aWorkingSet->FindDirectoryOfFile(file, &directory)) { @@ -756,7 +756,7 @@ xptiInterfaceInfoManager::DetermineAutoRegStrategy(nsISupportsArray* aSearchPath PRInt64 size; PRInt64 date; if(NS_FAILED(file->GetFileSize(&size)) || - NS_FAILED(file->GetLastModificationDate(&date)) || + NS_FAILED(file->GetLastModificationTime(&date)) || NS_FAILED(file->GetLeafName(getter_Copies(name)))) { NS_ERROR("unexpected!"); @@ -824,7 +824,7 @@ xptiInterfaceInfoManager::AddOnlyNewFilesFromFileList(nsISupportsArray* aSearchP PRInt64 date; PRUint32 dir; if(NS_FAILED(file->GetFileSize(&size)) || - NS_FAILED(file->GetLastModificationDate(&date)) || + NS_FAILED(file->GetLastModificationTime(&date)) || NS_FAILED(file->GetLeafName(getter_Copies(name))) || !aWorkingSet->FindDirectoryOfFile(file, &dir)) { @@ -965,7 +965,7 @@ xptiInterfaceInfoManager::DoFullValidationMergeFromFileList(nsISupportsArray* aS PRInt64 date; PRUint32 dir; if(NS_FAILED(file->GetFileSize(&size)) || - NS_FAILED(file->GetLastModificationDate(&date)) || + NS_FAILED(file->GetLastModificationTime(&date)) || NS_FAILED(file->GetLeafName(getter_Copies(name))) || !aWorkingSet->FindDirectoryOfFile(file, &dir)) { diff --git a/mozilla/xpcom/tests/utils/io.js b/mozilla/xpcom/tests/utils/io.js index 2c7fa02b378..066301fc64a 100644 --- a/mozilla/xpcom/tests/utils/io.js +++ b/mozilla/xpcom/tests/utils/io.js @@ -784,7 +784,7 @@ dateModified : function (path) { try { var fileInst = new FilePath(path); - var date = new Date(fileInst.lastModificationDate).toLocaleString(); + var date = new Date(fileInst.lastModificationTime).toLocaleString(); retval=date; } diff --git a/mozilla/xpfe/components/filepicker/res/content/nsFileView.js b/mozilla/xpfe/components/filepicker/res/content/nsFileView.js index 61979e201ae..8afb004a15b 100644 --- a/mozilla/xpfe/components/filepicker/res/content/nsFileView.js +++ b/mozilla/xpfe/components/filepicker/res/content/nsFileView.js @@ -207,7 +207,7 @@ nsFileView.prototype = { } else if (colID == "LastModifiedColumn") { if (!("cachedDate" in file)) { // perhaps overkill, but lets get the right locale handling - file.cachedDate = file.file.lastModificationDate; + file.cachedDate = file.file.lastModificationTime; file.cachedDateText = formatDate(file.cachedDate); } return file.cachedDateText; @@ -332,11 +332,11 @@ nsFileView.prototype = { break; case nsFileView.SORTTYPE_DATE: for (i = 0; i < this.mDirList.length; i++) { - this.mDirList[i].cachedDate = this.mDirList[i].file.lastModificationDate; + this.mDirList[i].cachedDate = this.mDirList[i].file.lastModificationTime; this.mDirList[i].cachedDateText = formatDate(this.mDirList[i].cachedDate); } for (i = 0; i < this.mFilteredFiles.length; i++) { - this.mFilteredFiles[i].cachedDate = this.mFilteredFiles[i].file.lastModificationDate; + this.mFilteredFiles[i].cachedDate = this.mFilteredFiles[i].file.lastModificationTime; this.mFilteredFiles[i].cachedDateText = formatDate(this.mFilteredFiles[i].cachedDate); } compareFunc = sortDate; @@ -380,7 +380,7 @@ nsFileView.prototype = { // this is a nsIFile object nextFile = { unicodeLeafName : nextFile.unicodeLeafName, fileSize : 0, - lastModificationDate : 0, + lastModificationTime : 0, isHidden: function() { return false; } }; } // end of hack diff --git a/mozilla/xpinstall/src/nsInstall.cpp b/mozilla/xpinstall/src/nsInstall.cpp index a61f1700be8..03be7ad14a1 100644 --- a/mozilla/xpinstall/src/nsInstall.cpp +++ b/mozilla/xpinstall/src/nsInstall.cpp @@ -1906,7 +1906,7 @@ nsInstall::FileOpFileGetModDate(nsInstallFolder& aTarget, double* aReturn) { double newStamp; PRInt64 lastModDate = LL_ZERO; - localFile->GetLastModificationDate(&lastModDate); + localFile->GetLastModificationTime(&lastModDate); LL_L2D(newStamp, lastModDate); @@ -1963,7 +1963,7 @@ nsInstall::FileOpFileModDateChanged(nsInstallFolder& aTarget, double aOldStamp, { double newStamp; PRInt64 lastModDate = LL_ZERO; - localFile->GetLastModificationDate(&lastModDate); + localFile->GetLastModificationTime(&lastModDate); LL_L2D(newStamp, lastModDate);