From 427714178ec89e3a24933a305a4de6ab1089847c Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sun, 9 May 2010 17:25:35 +0000 Subject: Minor loading functions refactoring, fixed XPath append_node for MSVC10 git-svn-id: http://pugixml.googlecode.com/svn/trunk@395 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.cpp | 142 ++++++++++++++++++++------------------------------------ 1 file changed, 51 insertions(+), 91 deletions(-) (limited to 'src/pugixml.cpp') diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 346a326..37f52fc 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -2650,6 +2650,41 @@ namespace assert(false); } } + + template xml_parse_result load_stream_impl(xml_document& doc, std::basic_istream >& stream, unsigned int options, encoding_t encoding) + { + if (!stream.good()) return MAKE_PARSE_RESULT(status_io_error); + + // get length of remaining data in stream + std::streamoff pos = stream.tellg(); + stream.seekg(0, std::ios::end); + std::streamoff length = stream.tellg() - pos; + stream.seekg(pos, std::ios::beg); + + if (!stream.good() || pos < 0 || length < 0) return MAKE_PARSE_RESULT(status_io_error); + + // read stream data into memory + size_t read_length = static_cast(length); + + T* s = static_cast(global_allocate((read_length > 0 ? read_length : 1) * sizeof(T))); + if (!s) return MAKE_PARSE_RESULT(status_out_of_memory); + + stream.read(s, static_cast(read_length)); + + // check for errors + size_t actual_length = static_cast(stream.gcount()); + assert(actual_length <= read_length); + + if (read_length > 0 && actual_length == 0) + { + global_deallocate(s); + return MAKE_PARSE_RESULT(status_io_error); + } + + // load data from buffer + return doc.load_buffer_inplace_own(s, actual_length * sizeof(T), options, encoding); + } + } namespace pugi @@ -3951,54 +3986,14 @@ namespace pugi { destroy(); - if (!stream.good()) return MAKE_PARSE_RESULT(status_io_error); - - std::streamoff length, pos = stream.tellg(); - stream.seekg(0, std::ios::end); - length = stream.tellg(); - stream.seekg(pos, std::ios::beg); - - if (!stream.good()) return MAKE_PARSE_RESULT(status_io_error); - - char* s = static_cast(global_allocate(length > 0 ? length : 1)); - if (!s) return MAKE_PARSE_RESULT(status_out_of_memory); - - stream.read(s, length); - - if (stream.gcount() > length || (length > 0 && stream.gcount() == 0)) - { - global_deallocate(s); - return MAKE_PARSE_RESULT(status_io_error); - } - - return load_buffer_inplace_own(s, stream.gcount(), options, encoding); // Parse the input string. + return load_stream_impl(*this, stream, options, encoding); } xml_parse_result xml_document::load(std::basic_istream >& stream, unsigned int options) { destroy(); - if (!stream.good()) return MAKE_PARSE_RESULT(status_io_error); - - std::streamoff length, pos = stream.tellg(); - stream.seekg(0, std::ios::end); - length = stream.tellg(); - stream.seekg(pos, std::ios::beg); - - if (!stream.good()) return MAKE_PARSE_RESULT(status_io_error); - - wchar_t* s = static_cast(global_allocate((length > 0 ? length : 1) * sizeof(wchar_t))); - if (!s) return MAKE_PARSE_RESULT(status_out_of_memory); - - stream.read(s, length); - - if (stream.gcount() > length || (length > 0 && stream.gcount() == 0)) - { - global_deallocate(s); - return MAKE_PARSE_RESULT(status_io_error); - } - - return load_buffer_inplace_own(s, stream.gcount() * sizeof(wchar_t), options, encoding_wchar); // Parse the input string. + return load_stream_impl(*this, stream, options, encoding_wchar); } #endif @@ -4063,7 +4058,7 @@ namespace pugi return load_buffer_inplace_own(s, length, options, encoding); } - xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, encoding_t encoding) + xml_parse_result xml_document::load_buffer_impl(void* contents, size_t size, unsigned int options, encoding_t encoding, bool is_mutable, bool own) { destroy(); @@ -4074,71 +4069,36 @@ namespace pugi char_t* buffer; size_t length; - if (!convert_buffer(buffer, length, buffer_encoding, contents, size, false)) return MAKE_PARSE_RESULT(status_out_of_memory); + if (!convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return MAKE_PARSE_RESULT(status_out_of_memory); + // delete original buffer if we performed a conversion + if (own && buffer != contents) global_deallocate(contents); + // parse xml_parse_result res = xml_parser::parse(buffer, length, _root, options); // remember encoding res.encoding = buffer_encoding; - // grab onto buffer - _buffer = buffer; + // grab onto buffer if it's our buffer, user is responsible for deallocating contens himself + if (own || buffer != contents) _buffer = buffer; return res; } - xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, encoding_t encoding) + xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, encoding_t encoding) { - destroy(); - - // get actual encoding - encoding_t buffer_encoding = get_buffer_encoding(encoding, contents, size); - - // get private buffer - char_t* buffer; - size_t length; - - if (!convert_buffer(buffer, length, buffer_encoding, contents, size, true)) return MAKE_PARSE_RESULT(status_out_of_memory); - - // parse - xml_parse_result res = xml_parser::parse(buffer, length, _root, options); - - // remember encoding - res.encoding = buffer_encoding; - - // grab onto buffer if it's our buffer, user is responsible for deallocating contens himself - if (buffer != contents) _buffer = buffer; + return load_buffer_impl(const_cast(contents), size, options, encoding, false, false); + } - return res; + xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, encoding_t encoding) + { + return load_buffer_impl(contents, size, options, encoding, true, false); } xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, encoding_t encoding) { - destroy(); - - // get actual encoding - encoding_t buffer_encoding = get_buffer_encoding(encoding, contents, size); - - // get private buffer - char_t* buffer; - size_t length; - - if (!convert_buffer(buffer, length, buffer_encoding, contents, size, true)) return MAKE_PARSE_RESULT(status_out_of_memory); - - // delete original buffer if we performed a conversion - if (buffer != contents) global_deallocate(contents); - - // parse - xml_parse_result res = xml_parser::parse(buffer, length, _root, options); - - // remember encoding - res.encoding = buffer_encoding; - - // grab onto buffer - _buffer = buffer; - - return res; + return load_buffer_impl(contents, size, options, encoding, true, true); } void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, encoding_t encoding) const -- cgit v1.2.3