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

landing dbaron's patch for bug 235735 "fix callers that cast away const on result of ns[C]String::get" r+sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@153357 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2004-02-28 22:34:07 +00:00
parent 56a874f764
commit af98e4f306
97 changed files with 221 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/profile/src/nsProfile.cpp
View File

@@ -803,7 +803,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
nsAutoString currProfileName;
if (nsCRT::IsAscii(cmdResult)) {
currProfileName.AssignWithConversion(strtok(NS_CONST_CAST(char*,(const char*)cmdResult), " "));
currProfileName.AssignWithConversion(strtok(cmdResult.BeginWriting(), " "));
}
else {
// get a platform charset
@@ -812,7 +812,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get a platform charset");
// convert the profile name to Unicode
nsCAutoString profileName(strtok(NS_CONST_CAST(char*,(const char*)cmdResult), " "));
nsCAutoString profileName(strtok(cmdResult.BeginWriting(), " "));
rv = ConvertStringToUnicode(charSet, profileName.get(), currProfileName);
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to convert ProfileName to unicode");
}