diff options
author | Matt A. Tobin <email@mattatobin.com> | 2022-04-09 16:53:35 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2022-04-09 16:53:35 -0500 |
commit | 853befa9d5604186c6c452afe07a37d372700e26 (patch) | |
tree | 29493ecd6a4dd21ff966c29f4fc20a396ef9d715 /components | |
parent | 645c946aa77a55b259bd98de78a6a9d9c342ed94 (diff) | |
download | aura-central-853befa9d5604186c6c452afe07a37d372700e26.tar.gz |
Revert "Issue %3057 - Part 9: Adjust all callsites for no longer using GetNativePath"
This reverts commit 097fa969802f76530384926e8ef1f56777be3783.
Diffstat (limited to 'components')
-rw-r--r-- | components/commandlines/nsCommandLine.cpp | 4 | ||||
-rw-r--r-- | components/profile/src/nsProfileLock.cpp | 8 | ||||
-rw-r--r-- | components/rdf/src/nsFileSystemDataSource.cpp | 2 | ||||
-rw-r--r-- | components/registry/src/nsChromeProtocolHandler.cpp | 3 |
4 files changed, 3 insertions, 14 deletions
diff --git a/components/commandlines/nsCommandLine.cpp b/components/commandlines/nsCommandLine.cpp index 07eccfc80..4f6257bef 100644 --- a/components/commandlines/nsCommandLine.cpp +++ b/components/commandlines/nsCommandLine.cpp @@ -266,11 +266,7 @@ nsCommandLine::ResolveFile(const nsAString& aArgument, nsIFile* *aResult) NS_CopyUnicodeToNative(aArgument, nativeArg); nsAutoCString newpath; -#ifdef XP_WIN - mWorkingDir->GetPersistentDescriptor(newpath); -#else mWorkingDir->GetNativePath(newpath); -#endif newpath.Append('/'); newpath.Append(nativeArg); diff --git a/components/profile/src/nsProfileLock.cpp b/components/profile/src/nsProfileLock.cpp index 5b6fbe0dc..654fbcd46 100644 --- a/components/profile/src/nsProfileLock.cpp +++ b/components/profile/src/nsProfileLock.cpp @@ -192,11 +192,7 @@ nsresult nsProfileLock::LockWithFcntl(nsIFile *aLockFile) nsresult rv = NS_OK; nsAutoCString lockFilePath; -#ifdef XP_WIN - rv = aLockFile->GetPersistentDescriptor(lockFilePath); -#else rv = aLockFile->GetNativePath(lockFilePath); -#endif if (NS_FAILED(rv)) { NS_ERROR("Could not get native path"); return rv; @@ -302,11 +298,7 @@ nsresult nsProfileLock::LockWithSymlink(nsIFile *aLockFile, bool aHaveFcntlLock) { nsresult rv; nsAutoCString lockFilePath; -#ifdef XP_WIN - rv = aLockFile->GetPersistentDescriptor(lockFilePath); -#else rv = aLockFile->GetNativePath(lockFilePath); -#endif if (NS_FAILED(rv)) { NS_ERROR("Could not get native path"); return rv; diff --git a/components/rdf/src/nsFileSystemDataSource.cpp b/components/rdf/src/nsFileSystemDataSource.cpp index c67656cd9..35632d1a3 100644 --- a/components/rdf/src/nsFileSystemDataSource.cpp +++ b/components/rdf/src/nsFileSystemDataSource.cpp @@ -186,7 +186,7 @@ FileSystemDataSource::Init() NS_NewFileURI(getter_AddRefs(furi), file); NS_ENSURE_TRUE(furi, NS_ERROR_FAILURE); - file->GetPersistentDescriptor(ieFavoritesDir); + file->GetNativePath(ieFavoritesDir); } #endif diff --git a/components/registry/src/nsChromeProtocolHandler.cpp b/components/registry/src/nsChromeProtocolHandler.cpp index 58a8cb7e3..f66c6d362 100644 --- a/components/registry/src/nsChromeProtocolHandler.cpp +++ b/components/registry/src/nsChromeProtocolHandler.cpp @@ -1,4 +1,5 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:set ts=4 sw=4 sts=4 et cin: */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -159,7 +160,7 @@ nsChromeProtocolHandler::NewChannel2(nsIURI* aURI, file->Exists(&exists); if (!exists) { nsAutoCString path; - file->GetPersistentDescriptor(path); + file->GetNativePath(path); printf("Chrome file doesn't exist: %s\n", path.get()); } } |