Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out to attempt to fix Mac orange. Bug 232691

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@156776 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-05-22 19:26:52 +00:00
parent 987b0c8dfc
commit 3594b59c19
56 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/xpinstall/src/nsInstall.cpp
View File

@@ -547,7 +547,7 @@ nsInstall::AddDirectory(const nsString& aRegName,
PRInt32* aReturn)
{
return AddDirectory(aRegName,
EmptyString(),
nsAutoString(),
aJarSource,
aFolder,
aSubdir,
@@ -565,11 +565,11 @@ nsInstall::AddDirectory(const nsString& aJarSource,
return NS_OK;
}
return AddDirectory(EmptyString(),
EmptyString(),
return AddDirectory(nsAutoString(),
nsAutoString(),
aJarSource,
mPackageFolder,
EmptyString(),
nsAutoString(),
INSTALL_NO_COMPARE,
aReturn);
}
@@ -740,11 +740,11 @@ nsInstall::AddSubcomponent(const nsString& aJarSource,
return NS_OK;
}
return AddSubcomponent(EmptyString(),
return AddSubcomponent(nsAutoString(),
version,
aJarSource,
mPackageFolder,
EmptyString(),
nsAutoString(),
INSTALL_NO_COMPARE,
aReturn);
}
@@ -1032,7 +1032,7 @@ nsInstall::GetComponentFolder(const nsString& aComponentName, const nsString& aS
PRInt32
nsInstall::GetComponentFolder(const nsString& aComponentName, nsInstallFolder** aNewFolder)
{
return GetComponentFolder(aComponentName, EmptyString(), aNewFolder);
return GetComponentFolder(aComponentName, nsAutoString(), aNewFolder);
}
PRInt32
@@ -1064,7 +1064,7 @@ PRInt32
nsInstall::GetFolder(const nsString& targetFolder, nsInstallFolder** aNewFolder)
{
/* This version of GetFolder takes an nsString object as the only param */
return GetFolder(targetFolder, EmptyString(), aNewFolder);
return GetFolder(targetFolder, nsAutoString(), aNewFolder);
}
PRInt32
@@ -1348,7 +1348,7 @@ nsInstall::Patch(const nsString& aRegName, const nsString& aVersion, const nsStr
PRInt32
nsInstall::Patch(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn)
{
return Patch(aRegName, EmptyString(), aJarSource, aFolder, aTargetName, aReturn);
return Patch(aRegName, nsAutoString(), aJarSource, aFolder, aTargetName, aReturn);
}
PRInt32
@@ -1415,7 +1415,7 @@ nsInstall::SetPackageFolder(nsInstallFolder& aFolder)
{
return OUT_OF_MEMORY;
}
nsresult res = folder->Init(aFolder, EmptyString());
nsresult res = folder->Init(aFolder, nsAutoString());
if (NS_FAILED(res))
{
@@ -1495,7 +1495,7 @@ nsInstall::StartInstall(const nsString& aUserPackageName, const nsString& aRegis
if (mPackageFolder && packageDir)
{
if (NS_FAILED( mPackageFolder->Init(packageDir, EmptyString()) ))
if (NS_FAILED( mPackageFolder->Init(packageDir, nsString()) ))
{
delete mPackageFolder;
mPackageFolder = nsnull;
@@ -1635,7 +1635,7 @@ nsInstall::FileOpDirGetParent(nsInstallFolder& aTarget, nsInstallFolder** thePar
{
return NS_ERROR_OUT_OF_MEMORY;
}
folder->Init(parent,EmptyString());
folder->Init(parent,nsString());
*theParentFolder = folder;
}
else