diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 16:45:34 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 16:45:34 +0000 |
| commit | bc9147a10c7287f285ddc1c246cc9d38cd5987c4 (patch) | |
| tree | 0e8516815d0fd31b439a4cebe4baf8e9e94c98d6 /chrome/common/libxml_utils.cc | |
| parent | c12bf1a1aa1a24d7f516b7e76428518c594d7da5 (diff) | |
| download | chromium_src-bc9147a10c7287f285ddc1c246cc9d38cd5987c4.zip chromium_src-bc9147a10c7287f285ddc1c246cc9d38cd5987c4.tar.gz chromium_src-bc9147a10c7287f285ddc1c246cc9d38cd5987c4.tar.bz2 | |
Some initial work on compiling chrome/common/ on Linux.
Patch from Pawel Hajdan Jr.
BUG=2410
Review URL: http://codereview.chromium.org/2929
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/libxml_utils.cc')
| -rw-r--r-- | chrome/common/libxml_utils.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/common/libxml_utils.cc b/chrome/common/libxml_utils.cc index 99362ee..06fbead 100644 --- a/chrome/common/libxml_utils.cc +++ b/chrome/common/libxml_utils.cc @@ -3,7 +3,10 @@ // found in the LICENSE file. #include "chrome/common/libxml_utils.h" + +#include "base/compiler_specific.h" #include "base/logging.h" +#include "base/string_util.h" #include "libxml/xmlreader.h" @@ -17,8 +20,8 @@ std::string XmlStringToStdString(const xmlChar* xmlstring) { XmlReader::XmlReader() : reader_(NULL), -#pragma warning(suppress: 4355) // Okay to pass "this" here. - error_func_(this, &XmlReader::GenericErrorCallback) { + ALLOW_THIS_IN_INITIALIZER_LIST( + error_func_(this, &XmlReader::GenericErrorCallback)) { } XmlReader::~XmlReader() { @@ -30,11 +33,9 @@ XmlReader::~XmlReader() { const char* msg, ...) { va_list args; va_start(args, msg); - char buffer[1 << 9]; - vsnprintf_s(buffer, arraysize(buffer), _TRUNCATE, msg, args); XmlReader* reader = static_cast<XmlReader*>(context); - reader->errors_.append(buffer); + reader->errors_.append(StringPrintf(msg, args)); } bool XmlReader::Load(const std::string& input) { |