summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2022-04-09 16:53:44 -0500
committerMatt A. Tobin <email@mattatobin.com>2022-04-09 16:53:44 -0500
commit834e49ea9adfb3f8c681f9d33b881dda964b1ef2 (patch)
treec5a9ec5ceaa5ba84075da2c39ccf3f97f5fead1d /components
parent853befa9d5604186c6c452afe07a37d372700e26 (diff)
downloadaura-central-834e49ea9adfb3f8c681f9d33b881dda964b1ef2.tar.gz
Revert "Revert "Issue %3057 - Part 6: Revert some of the previous changes for new approach.""
This reverts commit 56b8a05db34fabefad74e20876309263066b5bce.
Diffstat (limited to 'components')
-rw-r--r--components/jar/src/nsJAR.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/jar/src/nsJAR.cpp b/components/jar/src/nsJAR.cpp
index 205649e8d..f79a99948 100644
--- a/components/jar/src/nsJAR.cpp
+++ b/components/jar/src/nsJAR.cpp
@@ -418,7 +418,7 @@ nsJAR::GetJarPath(nsACString& aResult)
{
NS_ENSURE_ARG_POINTER(mZipFile);
- return mZipFile->GetPersistentDescriptor(aResult);
+ return mZipFile->GetNativePath(aResult);
}
nsresult
@@ -1120,7 +1120,7 @@ nsZipReaderCache::IsCached(nsIFile* zipFile, bool* aResult)
MutexAutoLock lock(mLock);
nsAutoCString uri;
- rv = zipFile->GetPersistentDescriptor(uri);
+ rv = zipFile->GetNativePath(uri);
if (NS_FAILED(rv))
return rv;
@@ -1142,7 +1142,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
#endif
nsAutoCString uri;
- rv = zipFile->GetPersistentDescriptor(uri);
+ rv = zipFile->GetNativePath(uri);
if (NS_FAILED(rv)) return rv;
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
@@ -1186,7 +1186,7 @@ nsZipReaderCache::GetInnerZip(nsIFile* zipFile, const nsACString &entry,
#endif
nsAutoCString uri;
- rv = zipFile->GetPersistentDescriptor(uri);
+ rv = zipFile->GetNativePath(uri);
if (NS_FAILED(rv)) return rv;
uri.Insert(NS_LITERAL_CSTRING("jar:"), 0);
@@ -1229,7 +1229,7 @@ nsZipReaderCache::GetFd(nsIFile* zipFile, PRFileDesc** aRetVal)
nsresult rv;
nsAutoCString uri;
- rv = zipFile->GetPersistentDescriptor(uri);
+ rv = zipFile->GetNativePath(uri);
if (NS_FAILED(rv)) {
return rv;
}
@@ -1370,7 +1370,7 @@ nsZipReaderCache::Observe(nsISupports *aSubject,
return NS_OK;
nsAutoCString uri;
- if (NS_FAILED(file->GetPersistentDescriptor(uri)))
+ if (NS_FAILED(file->GetNativePath(uri)))
return NS_OK;
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);