Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

making string conversions explicit

Browse Source
This commit is contained in:
scc%netscape.com 2000-04-21 07:09:51 +00:00
parent 51f69aee35
commit a10aa8dde5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xpcom/io/nsFileSpec.cpp
View File

@ -1146,7 +1146,7 @@ void nsFileSpec::GetFileSystemCharset(nsString & fileSystemCharset)
NS_ASSERTION(NS_SUCCEEDED(rv), "error getting platform charset");
if (NS_FAILED(rv))
aCharset.Assign("ISO-8859-1");
aCharset.AssignWithConversion("ISO-8859-1");
}
fileSystemCharset = aCharset;
}
@ -1198,7 +1198,7 @@ void nsFileSpec::GetNativePathString(nsString &nativePathString)
{
const char *path = GetCString();
if (nsnull == path) {
nativePathString.Assign("");
nativePathString.SetLength(0);
return;
}
else {
@ -1208,7 +1208,7 @@ void nsFileSpec::GetNativePathString(nsString &nativePathString)
delete [] converted;
}
else
nativePathString.Assign(path);
nativePathString.AssignWithConversion(path);
}
}
@ -1219,7 +1219,7 @@ void nsFileSpec::GetLeafName(nsString &nativePathString)
{
char * path = GetLeafName();
if (nsnull == path) {
nativePathString.Assign("");
nativePathString.SetLength(0);
return;
} else {
PRUnichar *converted = ConvertFromFileSystemCharset(path);
@ -1228,7 +1228,7 @@ void nsFileSpec::GetLeafName(nsString &nativePathString)
delete [] converted;
}
else
nativePathString.Assign(path);
nativePathString.AssignWithConversion(path);
nsCRT::free(path);
}