Commit Graph

336 Commits

Author SHA1 Message Date
Lee Thomason 5bf60e9dc6 try to fix the lld issue 2016-07-17 22:49:40 -07:00
Lee Thomason af9bce1762 support user data 2016-07-17 22:35:52 -07:00
Lee Thomason 536a4cde37 Merge branch 'master' into int64support 2016-07-17 21:37:39 -07:00
Manlio Morini 0f45b2422f Fixes issue #425 2016-07-11 12:14:59 +02:00
Lee Thomason 51c1271797 add int64 support 2016-06-04 20:18:49 -07:00
Lee Thomason 8553625730 one successful return type. simplify build on vs2015 2016-06-04 19:10:53 -07:00
Lee Thomason 97837e77f4 Merge pull request #428 from wvvelzen/WarningsFix
Fix 2 "Condition is always true" compiler warnings.
2016-03-25 07:41:51 -07:00
Wilfred van Velzen 0aeac18ad3 Fix 2 "Condition is always true" compiler warnings. 2016-03-25 14:14:03 +01:00
Wilfred van Velzen 67abee5610 Fix for Borland C++ Builder 6 2016-03-25 14:01:15 +01:00
Dmitry-Me 96b110d25e Assert to ensure ftell() behaves as expected by later code 2016-02-09 15:12:40 +03:00
Jarle Strand 81abfd6d4c Error fix DeleteChild
Added call to Unlink in XMLNode::DeleteChild() so that references to
node are removed before memory is unallocated. This will ensure the
child is removed from parent and that no pointers are referring to the
unallocated memory. (Code is now aligned with the code in
XMLNode::DeleteChildren() )
2015-12-27 17:30:04 +01:00
Dmitry-Me 0515fa9d27 Assertion in StrPair::SetStr() 2015-12-09 11:54:06 +03:00
Dmitry-Me 901fed5f19 Get rid of -Wtype-limits warning 2015-09-25 10:29:51 +03:00
PKEuS cac75789ba Declared *PRINTF wrappers as static 2015-08-15 18:19:53 +02:00
Dmitry-Me 96f38cca95 Asserts to ensure old buffer is not leaked when allocating a new one 2015-08-10 16:45:12 +03:00
Lee Thomason bb8fd3c29c Merge pull request #364 from PKEuS/master
Moved include of <cstdarg> to cpp file
2015-08-07 15:51:02 -07:00
Philipp Kloke 358202c77a Moved include of <cstdarg> to cpp file 2015-07-30 16:02:26 +02:00
Dmitry-Me 1d32e586d5 Asserts for formatted output length 2015-07-27 17:11:51 +03:00
Lee Thomason 78fca3db83 Merge pull request #361 from RossBencina/master
fix compiler warning (XCode 4.6.1 x86_64) tinyxml2.cpp:2146:77: Impli…
2015-07-23 17:00:05 -07:00
Dmitry-Me 886ad9787c Use "name" for element name 2015-07-22 11:00:51 +03:00
Ross Bencina e7fa0e159e fix compiler warning (XCode 4.6.1 x86_64) tinyxml2.cpp:2146:77: Implicit conversion loses integer precision: 'const size_t' (aka 'const unsigned long') to 'const int' 2015-07-22 16:58:05 +10:00
Dmitry-Me 8dd493b268 Better document warning suppression code 2015-07-02 13:59:30 +03:00
Lee Thomason 4824e95bc0 Merge pull request #343 from Dmitry-Me/checkEntityWasPrinted
Ensure proper pattern was found and printed
2015-07-01 14:18:15 -07:00
Dmitry-Me 1ca593c4ca Proper capitalize Visual Studio in comment 2015-06-22 12:49:32 +03:00
Lee Thomason aa8566b137 fix a macro version check 2015-06-19 16:52:40 -07:00
Lee Thomason 53db4a6cf4 move to cpp file. 2015-06-11 22:52:08 -07:00
pffang 1527cf4b2f Patch for Visual Studio 2003 and earlier.
This patch will be easy to extend in the future.
2015-06-09 13:57:11 +08:00
Dmitry-Me 687bf8211f Don't use -1 as buffer length 2015-06-08 18:06:44 +03:00
Dmitry-Me 39c399a0f2 Ensure proper pattern was found and printed 2015-05-28 15:32:27 +03:00
Lee Thomason 91f2dcfb5c Merge pull request #342 from Dmitry-Me/testErrorNames
Test error name is non-empty for the whole range
2015-05-26 11:09:12 -07:00
Dmitry-Me a1beddf486 Test error name is non-empty for the whole range 2015-05-26 16:19:21 +03:00
Dmitry-Me 962083b9d1 Remove redundant comment, fix typo and formatting 2015-05-26 11:38:30 +03:00
Dmitry-Me ca86a0fa2a Proper fix gcc -Wsign-compare 2015-05-25 11:29:14 +03:00
Lee Thomason c879a4d48c Merge pull request #338 from Dmitry-Me/removeAmbiguousEnumItems
Get rid of two distinct enum items with same same
2015-05-22 11:09:33 -07:00
Lee Thomason 949ae37e0a Merge pull request #337 from Dmitry-Me/checkEntityFoundExplicitly
Explicitly check entity was not found
2015-05-22 11:08:31 -07:00
Lee Thomason 8549202800 clean up Value of XMLDocument 2015-05-22 11:07:45 -07:00
Lee Thomason 7a93b33160 tighten up the error checks 2015-05-22 11:00:32 -07:00
Lee Thomason 2ecc203835 Merge branch 'patch-1' of https://github.com/SirR4T/tinyxml2 into SirR4T-patch-1 2015-05-22 10:57:00 -07:00
Dmitry-Me 5420e547d3 Get rid of two distinct enum items with same same 2015-05-20 10:51:26 +03:00
Dmitry-Me 764545e02a Explicitly check entity was not found 2015-05-20 10:29:24 +03:00
Sarat Addepalli 3df007ef9d Fix and use correct pointers and types.
Should have been `XMLDeclaration* decl = ...` instead of `XMLElement* ele = ...`
2015-05-20 10:43:51 +05:30
Sarat Addepalli 96b4346660 Remove unnecessary cast in XMLNode::Value() 2015-05-20 10:36:06 +05:30
Sarat Addepalli 9c3122b89b Bypass asserts for `XMLDocument::Value()`
When the node is an XMLDocument, bypass calling the `_value.GetStr()` function, since we know we have to return `( const char* )0` inevitably.

This fixes #323
2015-05-19 12:49:32 +05:30
Sarat Addepalli 2f0d173f94 Fix whitespaces in tinyxml2.cpp 2015-05-19 09:02:16 +05:30
Sarat Addepalli a0f499dda1 Fix ParseDeep() to close issue #332
If the node to be added is an XML Declaration, then check if the document has any children already.
XML Declarations can only be the FirstChild() s of an XML Document.
2015-05-18 09:25:17 +05:30
Dmitry-Me 67c429e4b4 Avoid unneeded printer object creation 2015-05-08 18:08:18 +03:00
Dmitry-Me 72801b8b20 First check, then convert 2015-05-07 09:41:39 +03:00
Dmitry-Me 2a8b1f5789 Ensure file contents fit into size_t range 2015-04-30 14:58:57 +03:00
Lee Thomason 882e89e601 Merge pull request #326 from Dmitry-Me/cleanupPointersComparison
Unify pointers comparison, consistency asserts
2015-04-27 16:57:37 -07:00
Dmitry-Me 69d521d354 Unify pointers comparison, consistency asserts 2015-04-20 18:05:53 +03:00
Dmitry-Me 2ad4320339 Range check without clang "always true" warning 2015-04-16 12:18:58 +03:00
Lee Thomason 4f0c2ffcab fix 'always true' warning 2015-04-13 13:58:20 -07:00
Dmitry-Me ccd267a782 Detect parsing error earlier when looking at end of tag 2015-04-10 15:42:54 +03:00
Lee Thomason e3932d6b7f Merge pull request #319 from Dmitry-Me/getRidOfNull
Get rid of NULL, cleanup formatting
2015-04-09 14:49:25 -07:00
Lee Thomason 5ea4f3cb77 Merge pull request #315 from Dmitry-Me/orderPatternsAsTheyAreSearched
Order patterns the same way they are searched
2015-04-09 14:48:44 -07:00
Dmitry-Me e76b8519d1 Get rid of NULL, cleanup formatting 2015-04-08 13:41:40 +03:00
Dmitry-Me 9614f8ff74 More consistency asserts 2015-04-08 10:06:06 +03:00
Dmitry-Me 400f1199ea Ensure enum is printed properly 2015-04-07 11:51:21 +03:00
Dmitry-Me 2667aab551 Const qualifiers where access is const, unify formatting 2015-04-03 10:56:59 +03:00
Lee Thomason 51b33321be Merge pull request #308 from Dmitry-Me/mergePrintCalls
Merge Print() calls
2015-04-02 13:27:50 -07:00
Dmitry-Me 6a79c17c87 Merge Print() calls 2015-03-31 12:18:17 +03:00
Dmitry-Me c505e136da Order patterns the same way they are searched 2015-03-30 09:54:36 +03:00
Dmitry-Me d95172ba47 Print entire substring instead of each character 2015-03-30 08:11:18 +03:00
Lee Thomason f657783cf2 merge fix for save file error 2015-03-26 11:18:21 -07:00
Lee Thomason 3ccb1cec29 minor formatting cleanup 2015-03-24 11:17:44 -07:00
Ant Mitchell 189198f19c Issue 302: clear any previous save error 2015-03-24 16:20:36 +00:00
Ant Mitchell 7e744771ad Issue299 - Allow Accept() to work with element trees that are not
linked in to the owning document.
2015-03-24 14:33:28 +00:00
Lee Thomason 2b1e18185c Merge pull request #298 from Dmitry-Me/fixCommentTypo
Fix comment typo
2015-03-16 11:57:38 -07:00
Dmitry-Me 2f465c412a Fix comment typo 2015-03-16 11:08:23 +03:00
Dmitry-Me 3dc797b2a4 Better asserts in parsing 2015-03-16 11:06:46 +03:00
Lee Thomason 245bee08d6 Merge pull request #296 from Dmitry-Me/assertForImpossibleCase
Assert for impossible case
2015-03-15 16:14:12 -07:00
Lee Thomason 80647bde2e Merge remote-tracking branch 'origin/master' 2015-03-15 16:12:51 -07:00
Lee Thomason 7265b763fc merge change; add extra assert 2015-03-15 16:11:47 -07:00
Dmitry-Me 33bb764d12 Assert for impossible case 2015-03-14 17:14:00 +03:00
Dmitry-Me bab9b6d59c More asserts in numbers parsing 2015-03-14 16:41:46 +03:00
Dmitry-Me 6f51c803a1 Resolve crash when printing malformed entities - issue 291 2015-03-14 13:25:03 +03:00
Dmitry-Me 9fcb876d3b Fix null pointer dereference planted in PR287 and reported in PR288 2015-03-05 17:53:34 +03:00
Dmitry-Me 023846628d Add and make use of pre- and post-asserts in XMLDocument::Identify() 2015-03-03 16:02:13 +03:00
Dmitry-Me 6acc9a5469 Move declaration to actual first use 2015-01-15 13:27:47 +03:00
Dmitry-Me 30bdc9735b Pre-asserts to clarify buffer usage 2015-01-14 08:32:23 +03:00
Lee Thomason d95716bd79 Merge pull request #273 from Dmitry-Me/moreChecksInUtfConversion
More checks inside UTF conversion
2015-01-13 13:39:46 -08:00
Lee Thomason 7e67bc89de minor formatting changes 2015-01-12 14:05:12 -08:00
Dmitry-Me bbaf1e1498 More checks inside UTF conversion 2015-01-12 14:07:10 +03:00
Dmitry-Me 9f56e12c16 strchr() can only find what is was asked for 2015-01-12 10:07:54 +03:00
Lee Thomason d15686653a Merge pull request #269 from Dmitry-Me/makeFormattingConsistent
Fix formatting, get rid of useless if-else chain
2015-01-09 16:57:17 -08:00
Lee Thomason f802660f7d Merge pull request #268 from Dmitry-Me/avoidRepeatedComparisons
Get rid of repeated comparisons
2015-01-09 16:56:40 -08:00
Dmitry-Me 257e11b25b Fix formatting, get rid of useless if-else chain 2015-01-09 15:50:47 +03:00
Dmitry-Me 3ae4f3eb3c Get rid of repeated comparisons 2015-01-09 15:44:16 +03:00
Dmitry-Me e28be7530c Use explicit const_cast 2015-01-09 14:59:30 +03:00
Lee Thomason 3cebdc4fac clean up function names. clean up pointer 2015-01-05 17:16:28 -08:00
Lee Thomason 75b4e23957 Merge pull request #260 from Dmitry-Me/placeChecksInMoreNaturalOrder
Rearrange checks in more natural order
2015-01-05 17:07:50 -08:00
Lee Thomason 6e504e9baf Merge pull request #259 from Dmitry-Me/preAndPostAssertsInGetStr
Pointer asserts in GetStr()
2015-01-05 17:07:06 -08:00
Lee Thomason 625402a01f Merge pull request #257 from Dmitry-Me/reusePreInsertMagic
Reuse pre-insert manipulations
2015-01-05 17:05:23 -08:00
Lee Thomason 56223ddaea Merge pull request #256 from Dmitry-Me/reuseParseAdjustments
Reuse code with pre-parse adjustments
2015-01-05 17:04:04 -08:00
Lee Thomason deccff765f Merge pull request #254 from JayXon/onlyCheckElementPointerOnce
Only check ele pointer once
2015-01-05 17:00:43 -08:00
Dmitry-Me 7a7e5dc525 Rearrange checks in more natural order 2015-01-01 17:58:35 +03:00
Dmitry-Me 5ffa73e979 Pointer asserts in GetStr() 2015-01-01 17:47:40 +03:00
Dmitry-Me 74e394023a Reuse pre-insert manipulations 2015-01-01 16:26:17 +03:00
Dmitry-Me 97476b7b9e Reuse code with pre-parse adjustments 2015-01-01 16:15:57 +03:00
Lee Thomason b4e81b014e Merge pull request #253 from Dmitry-Me/getRidOfC4127InAssert
Suppress C4127 in asserts
2014-12-26 16:25:14 -08:00