From 9d694516a06aefaa480036de73a43b2a47b78b77 Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Wed, 3 Sep 2014 13:54:49 -0700
Subject: [PATCH] clarify return value

---
 src/lib_json/json_writer.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index d46d938..e52fe4a 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -67,6 +67,7 @@ std::string valueToString(double value) {
   // Allocate a buffer that is more than large enough to store the 16 digits of
   // precision requested below.
   char buffer[32];
+  int len = -1;
 
 // Print into the buffer. We need not request the alternative representation
 // that always has a decimal point because JSON doesn't distingish the
@@ -74,38 +75,36 @@ std::string valueToString(double value) {
 #if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with
                                                       // visual studio 2005 to
                                                       // avoid warning.
-  int len;
   #if defined(WINCE)
   len = _snprintf(buffer, sizeof(buffer), "%.16g", value);
   #else
   len = sprintf_s(buffer, sizeof(buffer), "%.16g", value);
   #endif
-  assert(len>=0);
-  fixNumericLocale(buffer, buffer + len);
 #else
   if ( isfinite( value ))
   {
-    int len = snprintf(buffer, sizeof(buffer), "%.16g", value);
-    assert(len>=0);
-    fixNumericLocale(buffer, buffer + len);
+    len = snprintf(buffer, sizeof(buffer), "%.16g", value);
   }
   else
   {
      // IEEE standard states that NaN values will not compare to themselves
      if ( value != value)
      {
-        snprintf(buffer, sizeof(buffer), "null");
+        len = snprintf(buffer, sizeof(buffer), "null");
      }
      else if ( value < 0)
      {
-        snprintf(buffer, sizeof(buffer), "-1e+9999");
+        len = snprintf(buffer, sizeof(buffer), "-1e+9999");
      }
      else
      {
-        snprintf(buffer, sizeof(buffer), "1e+9999");
+        len = snprintf(buffer, sizeof(buffer), "1e+9999");
      }
+     // For those, we do not need to call fixNumLoc, but it is fast.
   }
 #endif
+  assert(len>=0);
+  fixNumericLocale(buffer, buffer + len);
   return buffer;
 }