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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/glue/dom_serializer.cc | 10 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc index 3f75d27..efc5c4b 100644 --- a/webkit/glue/dom_serializer.cc +++ b/webkit/glue/dom_serializer.cc @@ -105,11 +105,11 @@ namespace { // Default "mark of the web" declaration static const wchar_t* const kDefaultMarkOfTheWeb = - L"\n<!-- saved from url=(%04d)%s -->\n"; + L"\n<!-- saved from url=(%04d)%ls -->\n"; // Default meat content for writing correct charset declaration. static const wchar_t* const kDefaultMetaContent = - L"<META http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">"; + L"<META http-equiv=\"Content-Type\" content=\"text/html; charset=%ls\">"; // Notation of start comment. static const wchar_t* const kStartCommentNotation = L"<!-- "; @@ -119,14 +119,14 @@ static const wchar_t* const kEndCommentNotation = L" -->"; // Default XML declaration. static const wchar_t* const kXMLDeclaration = - L"<?xml version=\"%s\" encoding=\"%s\"%s?>\n"; + L"<?xml version=\"%ls\" encoding=\"%ls\"%ls?>\n"; // Default base tag declaration static const wchar_t* const kBaseTagDeclaration = - L"<BASE href=\".\"%s>"; + L"<BASE href=\".\"%ls>"; static const wchar_t* const kBaseTargetDeclaration = - L" target=\"%s\""; + L" target=\"%ls\""; // Maximum length of data buffer which is used to temporary save generated // html content data. diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index ada0bdb..f60eae2 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -186,7 +186,7 @@ std::wstring DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) { if (offset.width() > 0 || offset.height() > 0) { if (webFrameImpl->GetParent()) { - StringAppendF(&result, L"frame '%s' ", StringToStdWString( + StringAppendF(&result, L"frame '%ls' ", StringToStdWString( webFrameImpl->frame()->tree()->name()).c_str()); } StringAppendF(&result, L"scrolled to %d,%d\n", |