summaryrefslogtreecommitdiffstats
path: root/net/disk_cache
diff options
context:
space:
mode:
authormmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 00:41:45 +0000
committermmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 00:41:45 +0000
commit5115474e2e2c773b53fc1e111426e8924deeadb7 (patch)
tree6bdd56cdd544a3b331db7612781ae347739c4e82 /net/disk_cache
parent609990b5b4254601504935427483e3fc22cfde80 (diff)
downloadchromium_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 'net/disk_cache')
-rw-r--r--net/disk_cache/backend_impl.cc4
-rw-r--r--net/disk_cache/block_files.cc3
-rw-r--r--net/disk_cache/stress_cache.cc2
3 files changed, 5 insertions, 4 deletions
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index 38d17d6..1845870 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -90,7 +90,7 @@ int LowWaterAdjust(int high_water) {
std::wstring GetPrefixedName(const std::wstring& path, const std::wstring& name,
int index) {
std::wstring prefixed(path);
- std::wstring tmp = StringPrintf(L"%s%s_%03d", L"old_", name.c_str(), index);
+ std::wstring tmp = StringPrintf(L"%ls%ls_%03d", L"old_", name.c_str(), index);
file_util::AppendToPath(&prefixed, tmp);
return prefixed;
}
@@ -560,7 +560,7 @@ std::wstring BackendImpl::GetFileName(Addr address) const {
return std::wstring();
}
- std::wstring name = StringPrintf(L"%s\\f_%06x", path_.c_str(),
+ std::wstring name = StringPrintf(L"%ls\\f_%06x", path_.c_str(),
address.FileNumber());
return name;
}
diff --git a/net/disk_cache/block_files.cc b/net/disk_cache/block_files.cc
index 79be295..db49e3a 100644
--- a/net/disk_cache/block_files.cc
+++ b/net/disk_cache/block_files.cc
@@ -210,7 +210,8 @@ void BlockFiles::CloseFiles() {
std::wstring BlockFiles::Name(int index) {
// The file format allows for 256 files.
DCHECK(index < 256 || index >= 0);
- std::wstring name = StringPrintf(L"%s%s%d", path_.c_str(), kBlockName, index);
+ std::wstring name = StringPrintf(L"%ls%ls%d",
+ path_.c_str(), kBlockName, index);
return name;
}
diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index 74f257a..3e8714b 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -54,7 +54,7 @@ int RunSlave(int iteration) {
std::wstring exe;
PathService::Get(base::FILE_EXE, &exe);
- std::wstring command = StringPrintf(L"%s %d", exe.c_str(), iteration);
+ std::wstring command = StringPrintf(L"%ls %d", exe.c_str(), iteration);
STARTUPINFO startup_info = {0};
startup_info.cb = sizeof(startup_info);