Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 21:36:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert r49824

Browse source 
svn path=/trunk/; revision=49827
This commit is contained in:
Timo Kreuzer 2010-11-27 22:24:15 +00:00
parent 1d70b8136a
commit 250e056ece
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/tools/xml.cpp
View file

@ -18,7 +18,6 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning ( disable : 4786 ) #pragma warning ( disable : 4786 )
#pragma warning ( disable : 4996 )
#endif//_MSC_VER #endif//_MSC_VER
#ifdef WIN32 #ifdef WIN32
@ -42,6 +41,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "xml.h" #include "xml.h"
#include "ssprintf.h"
#ifndef MAX_PATH #ifndef MAX_PATH
#define MAX_PATH _MAX_PATH #define MAX_PATH _MAX_PATH
@ -100,9 +100,7 @@ XMLException::XMLException (
void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args )
{ {
char buffer[1024]; _e = location + ": " + ssvprintf(format,args);
_vsnprintf(buffer, sizeof(buffer)-1, format, args);
_e = location + ": " + buffer;
} }
void XMLException::SetException ( const std::string& location, const char* format, ... ) void XMLException::SetException ( const std::string& location, const char* format, ... )
@ -426,14 +424,13 @@ string
XMLFile::Location() const XMLFile::Location() const
{ {
int line = 1; int line = 1;
char line_str[10];
const char* p = strchr ( _buf.c_str(), '\n' ); const char* p = strchr ( _buf.c_str(), '\n' );
while ( p && p < _p ) while ( p && p < _p )
{ {
++line; ++line;
p = strchr ( p+1, '\n' ); p = strchr ( p+1, '\n' );
} }
return _filename + "(" + itoa(line, line_str, 10) + ")"; return ssprintf ( "%s(%i)",_filename.c_str(), line );
} }
XMLAttribute::XMLAttribute() XMLAttribute::XMLAttribute()