diff options
| author | Renaud Guillard <dev@nore.fr> | 2017-06-11 18:33:28 +0200 |
|---|---|---|
| committer | Renaud Guillard <dev@nore.fr> | 2017-06-11 18:33:28 +0200 |
| commit | 0d8022eced90223e593d499af23317407abc5c18 (patch) | |
| tree | fd2a27fc820cb3892281e6a8c8e03a85f29da389 | |
| parent | 810f1f600d5366fc3d3f95189ce2fe7699532e25 (diff) | |
use snprintf if available, _snprintf or sprintf otherwise
| -rw-r--r-- | src/pugixml.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 37a62fc..25606d2 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -127,6 +127,10 @@ using std::memset; # define PUGI__MSVC_CRT_VERSION _MSC_VER #endif +#if (defined(PUGI__MSVC_CRT_VERSION) && (PUGI__MSVC_CRT_VERSION >= 1900)) || (__cplusplus >= 201103) +# define PUGI__HAVE_SNPRINTF +#endif + #ifdef PUGIXML_HEADER_ONLY # define PUGI__NS_BEGIN namespace pugi { namespace impl { # 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) { char buf[128]; -#if defined(PUGI__MSVC_CRT_VERSION) +#if defined(PUGI__HAVE_SNPRINTF) + snprintf(buf, 128, "%.9g", value); +#elif defined(PUGI__MSVC_CRT_VERSION) _snprintf(buf, 128, "%.9g", value); + buf[127] = '\0'; #else - snprintf(buf, 128, "%.9g", value); + sprintf(buf, "%.9g", value); #endif - buf[127] = '\0'; 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) { char buf[128]; -#if defined(PUGI__MSVC_CRT_VERSION) +#if defined(PUGI__HAVE_SNPRINTF) + snprintf(buf, 128, "%.17g", value); +#elif defined (PUGI__MSVC_CRT_VERSION) _snprintf(buf, 128, "%.17g", value); + buf[127] = '\0'; #else - snprintf(buf, 128, "%.17g", value); + sprintf(buf, "%.17g", value); #endif - buf[127] = '\0'; 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) { // 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); +#elif defined(PUGI__MSVC_CRT_VERSION) _snprintf(buffer, buffer_size, "%.*e", DBL_DIG, value); + buffer[buffer_size - 1] = '\0'; #else - snprintf(buffer, buffer_size, "%.*e", DBL_DIG, value); + sprintf(buffer, "%.*e", DBL_DIG, value); + assert(strlen(buffer) < buffer_size); #endif - buffer[buffer_size - 1] = '\0'; + // get the exponent (possibly negative) char* exponent_string = strchr(buffer, 'e'); |