diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/disk_cache/backend_impl.cc | 4 | ||||
| -rw-r--r-- | net/disk_cache/block_files.cc | 3 | ||||
| -rw-r--r-- | net/disk_cache/stress_cache.cc | 2 | ||||
| -rw-r--r-- | net/tools/crash_cache/crash_cache.cc | 2 | ||||
| -rw-r--r-- | net/tools/tld_cleanup/tld_cleanup.cc | 6 |
5 files changed, 9 insertions, 8 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); diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index 859cf94..f007feb 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -61,7 +61,7 @@ int RunSlave(RankCrashes action) { std::wstring exe; PathService::Get(base::FILE_EXE, &exe); - std::wstring command = StringPrintf(L"%s %d", exe.c_str(), action); + std::wstring command = StringPrintf(L"%ls %d", exe.c_str(), action); STARTUPINFO startup_info = {0}; startup_info.cb = sizeof(startup_info); diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc index 1dc5391..cbd1b5b 100644 --- a/net/tools/tld_cleanup/tld_cleanup.cc +++ b/net/tools/tld_cleanup/tld_cleanup.cc @@ -161,7 +161,7 @@ NormalizeResult NormalizeFile(const std::wstring& in_filename, const std::wstring& out_filename) { std::string data; if (!file_util::ReadFileToString(in_filename, &data)) { - fwprintf(stderr, L"Unable to read file %s\n", in_filename.c_str()); + fwprintf(stderr, L"Unable to read file %ls\n", in_filename.c_str()); // We return success since we've already reported the error. return kSuccess; } @@ -174,7 +174,7 @@ NormalizeResult NormalizeFile(const std::wstring& in_filename, FILE_ATTRIBUTE_NORMAL, NULL)); if (outfile == INVALID_HANDLE_VALUE) { - fwprintf(stderr, L"Unable to write file %s\n", out_filename.c_str()); + fwprintf(stderr, L"Unable to write file %ls\n", out_filename.c_str()); // We return success since we've already reported the error. return kSuccess; } @@ -260,7 +260,7 @@ int main(int argc, const char* argv[]) { NormalizeResult result = NormalizeFile(UTF8ToWide(argv[1]), UTF8ToWide(argv[2])); if (result != kSuccess) { - fwprintf(stderr, L"Errors or warnings processing file. See log in %s.", + fwprintf(stderr, L"Errors or warnings processing file. See log in %ls.", kLogFileName); } |