clean up some warnings

This commit is contained in:
Lee Thomason 2012-06-15 14:30:44 -07:00
parent c78dc01bfd
commit a3efec0449
4 changed files with 10 additions and 4 deletions

View File

@ -10,7 +10,7 @@ include(GNUInstallDirs)
################################ ################################
# set lib version here # set lib version here
set(GENERIC_LIB_VERSION "1.0.2") set(GENERIC_LIB_VERSION "1.0.3")
set(GENERIC_LIB_SOVERSION "1") set(GENERIC_LIB_SOVERSION "1")

2
dox
View File

@ -32,7 +32,7 @@ PROJECT_NAME = "TinyXML-2"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 1.0.2 PROJECT_NUMBER = 1.0.3
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

View File

@ -1394,7 +1394,12 @@ int XMLDocument::LoadFile( FILE* fp )
} }
charBuffer = new char[size+1]; charBuffer = new char[size+1];
fread( charBuffer, size, 1, fp ); size_t read = fread( charBuffer, 1, size, fp );
if ( read != size ) {
SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
return errorID;
}
charBuffer[size] = 0; charBuffer[size] = 0;
const char* p = charBuffer; const char* p = charBuffer;

View File

@ -85,7 +85,7 @@ distribution.
static const int TIXML2_MAJOR_VERSION = 1; static const int TIXML2_MAJOR_VERSION = 1;
static const int TIXML2_MINOR_VERSION = 0; static const int TIXML2_MINOR_VERSION = 0;
static const int TIXML2_PATCH_VERSION = 2; static const int TIXML2_PATCH_VERSION = 3;
namespace tinyxml2 namespace tinyxml2
{ {
@ -727,6 +727,7 @@ enum {
XML_ERROR_FILE_NOT_FOUND, XML_ERROR_FILE_NOT_FOUND,
XML_ERROR_FILE_COULD_NOT_BE_OPENED, XML_ERROR_FILE_COULD_NOT_BE_OPENED,
XML_ERROR_FILE_READ_ERROR,
XML_ERROR_ELEMENT_MISMATCH, XML_ERROR_ELEMENT_MISMATCH,
XML_ERROR_PARSING_ELEMENT, XML_ERROR_PARSING_ELEMENT,
XML_ERROR_PARSING_ATTRIBUTE, XML_ERROR_PARSING_ATTRIBUTE,