diff options
| author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 00:41:45 +0000 |
|---|---|---|
| committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 00:41:45 +0000 |
| commit | 5115474e2e2c773b53fc1e111426e8924deeadb7 (patch) | |
| tree | 6bdd56cdd544a3b331db7612781ae347739c4e82 /base | |
| parent | 609990b5b4254601504935427483e3fc22cfde80 (diff) | |
| download | chromium_src-5115474e2e2c773b53fc1e111426e8924deeadb7.zip chromium_src-5115474e2e2c773b53fc1e111426e8924deeadb7.tar.gz chromium_src-5115474e2e2c773b53fc1e111426e8924deeadb7.tar.bz2 | |
Use %ls instead of %s in wprintf format strings for wchar_t fields.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/command_line.cc | 2 | ||||
| -rw-r--r-- | base/file_version_info.cc | 2 | ||||
| -rw-r--r-- | base/gfx/font_utils.cc | 2 | ||||
| -rw-r--r-- | base/win_util.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index 21c7470..4346268 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -308,7 +308,7 @@ void CommandLine::AppendSwitchWithValue(wstring* command_line_string, (value_string[0] != L'"') && (value_string[value_string.length() - 1] != L'"')) { // need to provide quotes - StringAppendF(command_line_string, L"\"%s\"", value_string.c_str()); + StringAppendF(command_line_string, L"\"%ls\"", value_string.c_str()); } else { command_line_string->append(value_string); } diff --git a/base/file_version_info.cc b/base/file_version_info.cc index 90aedd2..fbe90a1 100644 --- a/base/file_version_info.cc +++ b/base/file_version_info.cc @@ -183,7 +183,7 @@ bool FileVersionInfo::GetValue(const wchar_t* name, std::wstring* value_str) { WORD language = lang_codepage[i++]; WORD code_page = lang_codepage[i++]; _snwprintf_s(sub_block, MAX_PATH, MAX_PATH, - L"\\StringFileInfo\\%04x%04x\\%s", language, code_page, name); + L"\\StringFileInfo\\%04x%04x\\%ls", language, code_page, name); LPVOID value = NULL; uint32 size; BOOL r = ::VerQueryValue(data_.get(), sub_block, &value, &size); diff --git a/base/gfx/font_utils.cc b/base/gfx/font_utils.cc index 9ca1852..cf8fce4 100644 --- a/base/gfx/font_utils.cc +++ b/base/gfx/font_utils.cc @@ -295,7 +295,7 @@ bool GetDerivedFontData(const wchar_t *family, // TODO(jungshik) : This comes up pretty high in the profile so that // we need to measure whether using SHA256 (after coercing all the // fields to char*) is faster than StringPrintf. - std::wstring font_key = StringPrintf(L"%1d:%d:%s", style, logfont->lfHeight, + std::wstring font_key = StringPrintf(L"%1d:%d:%ls", style, logfont->lfHeight, family); FontDataCache::const_iterator iter = font_data_cache->find(font_key); FontData *derived; diff --git a/base/win_util.cc b/base/win_util.cc index a5b46f5..74aed14 100644 --- a/base/win_util.cc +++ b/base/win_util.cc @@ -220,7 +220,7 @@ bool GetLogonSessionOnlyDACL(SECURITY_DESCRIPTOR** security_descriptor) { if (!ConvertSidToStringSid(logon_sid, &sid_string)) return false; - static const wchar_t dacl_format[] = L"D:(A;OICI;GA;;;%s)"; + static const wchar_t dacl_format[] = L"D:(A;OICI;GA;;;%ls)"; wchar_t dacl[SECURITY_MAX_SID_SIZE + arraysize(dacl_format) + 1] = {0}; wsprintf(dacl, dacl_format, sid_string); |