External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use snprintf if available, _snprintf or sprintf otherwise

Browse Source
This commit is contained in:
Renaud Guillard 2017-06-11 18:33:28 +02:00
parent 810f1f600d
commit 0d8022eced
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pugixml.cpp
View File

@ -127,6 +127,10 @@ using std::memset;
# define PUGI__MSVC_CRT_VERSION _MSC_VER # define PUGI__MSVC_CRT_VERSION _MSC_VER
#endif #endif
#if (defined(PUGI__MSVC_CRT_VERSION) && (PUGI__MSVC_CRT_VERSION >= 1900)) || (__cplusplus >= 201103)
# define PUGI__HAVE_SNPRINTF
#endif
#ifdef PUGIXML_HEADER_ONLY #ifdef PUGIXML_HEADER_ONLY
# define PUGI__NS_BEGIN namespace pugi { namespace impl { # define PUGI__NS_BEGIN namespace pugi { namespace impl {
# define PUGI__NS_END } } # define PUGI__NS_END } }
@ -4632,12 +4636,14 @@ PUGI__NS_BEGIN
PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value) PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value)
{ {
char buf[128]; char buf[128];
#if defined(PUGI__MSVC_CRT_VERSION) #if defined(PUGI__HAVE_SNPRINTF)
_snprintf(buf, 128, "%.9g", value);
#else
snprintf(buf, 128, "%.9g", value); snprintf(buf, 128, "%.9g", value);
#endif #elif defined(PUGI__MSVC_CRT_VERSION)
_snprintf(buf, 128, "%.9g", value);
buf[127] = '\0'; buf[127] = '\0';
#else
sprintf(buf, "%.9g", value);
#endif
return set_value_ascii(dest, header, header_mask, buf); return set_value_ascii(dest, header, header_mask, buf);
} }
@ -4646,12 +4652,14 @@ PUGI__NS_BEGIN
PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value) PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value)
{ {
char buf[128]; char buf[128];
#if defined(PUGI__MSVC_CRT_VERSION) #if defined(PUGI__HAVE_SNPRINTF)
_snprintf(buf, 128, "%.17g", value);
#else
snprintf(buf, 128, "%.17g", value); snprintf(buf, 128, "%.17g", value);
#endif #elif defined (PUGI__MSVC_CRT_VERSION)
_snprintf(buf, 128, "%.17g", value);
buf[127] = '\0'; buf[127] = '\0';
#else
sprintf(buf, "%.17g", value);
#endif
return set_value_ascii(dest, header, header_mask, buf); return set_value_ascii(dest, header, header_mask, buf);
} }
@ -8007,12 +8015,16 @@ PUGI__NS_BEGIN
PUGI__FN void convert_number_to_mantissa_exponent(double value, char* buffer, size_t buffer_size, char** out_mantissa, int* out_exponent) PUGI__FN void convert_number_to_mantissa_exponent(double value, char* buffer, size_t buffer_size, char** out_mantissa, int* out_exponent)
{ {
// get a scientific notation value with IEEE DBL_DIG decimals // get a scientific notation value with IEEE DBL_DIG decimals
#if defined(PUGI__MSVC_CRT_VERSION) #if defined(PUGI__HAVE_SNPRINTF)
_snprintf(buffer, buffer_size, "%.*e", DBL_DIG, value);
#else
snprintf(buffer, buffer_size, "%.*e", DBL_DIG, value); snprintf(buffer, buffer_size, "%.*e", DBL_DIG, value);
#endif #elif defined(PUGI__MSVC_CRT_VERSION)
_snprintf(buffer, buffer_size, "%.*e", DBL_DIG, value);
buffer[buffer_size - 1] = '\0'; buffer[buffer_size - 1] = '\0';
#else
sprintf(buffer, "%.*e", DBL_DIG, value);
assert(strlen(buffer) < buffer_size);
#endif
// get the exponent (possibly negative) // get the exponent (possibly negative)
char* exponent_string = strchr(buffer, 'e'); char* exponent_string = strchr(buffer, 'e');