Initial plan

Since GCC version 4.9.3 does not support the -Wimplicit-fallthrough warning option or the __attribute__((fallthrough)) annotation,
introduce the corresponding fixes to prevent build errors.

readme.md

@@ -59,7 +59,7 @@ browsers or have more complete XML needs, TinyXML-2 is not the parser for you.
 TinyXML-1 vs. TinyXML-2
 -----------------------
 
-TinyXML-2 has long been the focus of all development. It is well tested 
+TinyXML-2 long been the focus of all development. It is well tested 
 and should be used instead of TinyXML-1.
 
 TinyXML-2 uses a similar API to TinyXML-1 and the same
@@ -145,7 +145,7 @@ It essentially causes the XML to be parsed twice.
 
 For applications that need to know about text nodes that are composed entirely of 
 whitespace, PEDANTIC_WHITESPACE is available. PEDANTIC_WHITESPACE maintains all the
-whitespace between elements. 
+whilespace between elements. 
 
 PEDANTIC_WHITESPACE is a new mode and not as tested as the other whitespace modes.
 
@@ -178,7 +178,7 @@ will have the Value() of "Far & Away" when queried from the XMLText object,
 and will be written back to the XML stream/file as an ampersand.
 
 Additionally, any character can be specified by its Unicode code point:
-The syntax ` ` or ` ` both refer to the non-breaking space character.
+The syntax ` ` or ` ` are both to the non-breaking space character.
 This is called a 'numeric character reference'. Any numeric character reference
 that isn't one of the special entities above, will be read, but written as a
 regular code point. The output is correct, but the entity syntax isn't preserved.
@@ -270,7 +270,7 @@ tinyxml2.h files in your project and build with your other source code.
 
 There is also a CMake build included. CMake is the general build for TinyXML-2.
 
-(Additional build systems are costly to maintain, and tend to become outdated. They are
+(Additional build systems are costly to maintain, and tend to bit-rot. They are
 being removed over time.)
 
 Building TinyXML-2 - Using vcpkg

tinyxml2.cpp

@@ -36,20 +36,38 @@ distribution.
 #ifndef __has_attribute
 #   define __has_attribute(x) 0
 #endif
-#ifndef __has_cpp_attribute
-#  define __has_cpp_attribute(x) 0
+#ifdef __cplusplus
+#   ifndef __has_cpp_attribute
+#      define __has_cpp_attribute(x) 0
+#   endif
+#else
+#   ifndef __has_c_attribute
+#      define __has_c_attribute(x) 0
+#   endif
 #endif
 
-#if defined(_MSC_VER)
-#   define TIXML_FALLTHROUGH (void(0))
-#elif (__cplusplus >= 201703L && __has_cpp_attribute(fallthrough))
-#   define TIXML_FALLTHROUGH [[fallthrough]]
-#elif __has_cpp_attribute(clang::fallthrough)
-#   define TIXML_FALLTHROUGH [[clang::fallthrough]]
-#elif __has_attribute(fallthrough)
-#   define TIXML_FALLTHROUGH __attribute__((fallthrough))
+#ifdef __cplusplus
+#   if defined(_MSC_VER)
+#      define TIXML_FALLTHROUGH (void(0))
+#   elif (__cplusplus >= 201703L && __has_cpp_attribute(fallthrough))
+#      define TIXML_FALLTHROUGH [[fallthrough]]
+#   elif __has_cpp_attribute(clang::fallthrough)
+#      define TIXML_FALLTHROUGH [[clang::fallthrough]]
+#   elif __has_attribute(fallthrough)
+#      define TIXML_FALLTHROUGH __attribute__((fallthrough))
+#   else
+#      define TIXML_FALLTHROUGH (void(0))
+#   endif
 #else
-#   define TIXML_FALLTHROUGH (void(0))
+#   if defined(_MSC_VER)
+#      define TIXML_FALLTHROUGH (void(0))
+#   elif __has_c_attribute(fallthrough)
+#      define TIXML_FALLTHROUGH [[fallthrough]]
+#   elif __has_attribute(fallthrough)
+#      define TIXML_FALLTHROUGH __attribute__((fallthrough))
+#   else
+#      define TIXML_FALLTHROUGH (void(0))
+#   endif
 #endif
 
 
@@ -114,9 +132,6 @@ distribution.
 	#define TIXML_VSNPRINTF	vsnprintf
 	static inline int TIXML_VSCPRINTF( const char* format, va_list va )
 	{
-	    if (!format) {
-	        return 0;
-	    }
 		int len = vsnprintf( 0, 0, format, va );
 		TIXMLASSERT( len >= 0 );
 		return len;
@@ -834,17 +849,7 @@ XMLNode::XMLNode( XMLDocument* doc ) :
 
 XMLNode::~XMLNode()
 {
-    // Fast path: this node is dying, so maintaining _firstChild/_lastChild and
-    // sibling _prev/_next links is unnecessary. Only _parent must be zeroed to
-    // satisfy the MarkInUse assertion inside DeleteNode.
-    XMLNode *currentChild = _firstChild;
-    while (currentChild != NULL) {
-        XMLNode *next = currentChild->_next;
-        currentChild->_parent = 0;
-        DeleteNode(currentChild);
-        currentChild = next;
-    }
-
+    DeleteChildren();
     if ( _parent ) {
         _parent->Unlink( this );
     }
@@ -2357,10 +2362,9 @@ static FILE* callfopen( const char* filepath, const char* mode )
     return fp;
 }
 
-void XMLDocument::DeleteNode( XMLNode* node )	{   
-    if(node == 0) {
-        return; // check for null pointer
-    }
+void XMLDocument::DeleteNode( XMLNode* node )	{
+    TIXMLASSERT( node );
+    TIXMLASSERT(node->_document == this );
     if (node->_parent) {
         node->_parent->DeleteChild( node );
     }
@@ -2670,7 +2674,7 @@ void XMLPrinter::Write( const char* data, size_t size )
         fwrite ( data , sizeof(char), size, _fp);
     }
     else {
-        char* p = _buffer.PushArr( size ) - 1;   // back up over the null terminator.
+        char* p = _buffer.PushArr( static_cast<int>(size) ) - 1;   // back up over the null terminator.
         memcpy( p, data, size );
         p[size] = 0;
     }

tinyxml2.h

@@ -42,6 +42,14 @@ distribution.
 #endif
 #include <stdint.h>
 
+/*
+	gcc:
+        g++ -Wall -DTINYXML2_DEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe
+
+    Formatting, Artistic Style:
+        AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h
+*/
+
 #if defined( _DEBUG ) || defined (__DEBUG__)
 #   ifndef TINYXML2_DEBUG
 #       define TINYXML2_DEBUG

xmltest.cpp

@@ -2025,13 +2025,7 @@ int main( int argc, const char ** argv )
 		XMLTest("Parse nested elements with pedantic whitespace", false, doc.Error());
 		XMLTest("Pedantic whitespace", true, 0 == doc.RootElement()->FirstChildElement()->GetText());
 	}
-	//Check the robustness of the DeleteNode function in handling null pointers.
-	{
-		XMLDocument doc;
-		doc.DeleteNode(nullptr);
-		XMLTest("DeleteNode with null pointer", true, doc.Error() == XML_SUCCESS);
-	}
-		
+
 	// Check sample xml can be parsed with pedantic mode
 	{
 		XMLDocument doc(true, PEDANTIC_WHITESPACE);