clarify return value

cdunn2001 · cdunn2001 · commit 9d694516a06a · 2014-09-03T13:54:49.000-07:00
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -67,45 +67,44 @@ 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
 // concepts of reals and integers.
 #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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,45 +67,44 @@ std::string valueToString(double value) {`
`67`	`67`	`// Allocate a buffer that is more than large enough to store the 16 digits of`
`68`	`68`	`// precision requested below.`
`69`	`69`	`char buffer[32];`
	`70`	`+ int len = -1;`
`70`	`71`
`71`	`72`	`// Print into the buffer. We need not request the alternative representation`
`72`	`73`	`// that always has a decimal point because JSON doesn't distingish the`
`73`	`74`	`// concepts of reals and integers.`
`74`	`75`	`#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with`
`75`	`76`	`// visual studio 2005 to`
`76`	`77`	`// avoid warning.`
`77`		`- int len;`
`78`	`78`	`#if defined(WINCE)`
`79`	`79`	`len = _snprintf(buffer, sizeof(buffer), "%.16g", value);`
`80`	`80`	`#else`
`81`	`81`	`len = sprintf_s(buffer, sizeof(buffer), "%.16g", value);`
`82`	`82`	`#endif`
`83`		`- assert(len>=0);`
`84`		`- fixNumericLocale(buffer, buffer + len);`
`85`	`83`	`#else`
`86`	`84`	`if ( isfinite( value ))`
`87`	`85`	`{`
`88`		`- int len = snprintf(buffer, sizeof(buffer), "%.16g", value);`
`89`		`- assert(len>=0);`
`90`		`- fixNumericLocale(buffer, buffer + len);`
	`86`	`+ len = snprintf(buffer, sizeof(buffer), "%.16g", value);`
`91`	`87`	`}`
`92`	`88`	`else`
`93`	`89`	`{`
`94`	`90`	`// IEEE standard states that NaN values will not compare to themselves`
`95`	`91`	`if ( value != value)`
`96`	`92`	`{`
`97`		`- snprintf(buffer, sizeof(buffer), "null");`
	`93`	`+ len = snprintf(buffer, sizeof(buffer), "null");`
`98`	`94`	`}`
`99`	`95`	`else if ( value < 0)`
`100`	`96`	`{`
`101`		`- snprintf(buffer, sizeof(buffer), "-1e+9999");`
	`97`	`+ len = snprintf(buffer, sizeof(buffer), "-1e+9999");`
`102`	`98`	`}`
`103`	`99`	`else`
`104`	`100`	`{`
`105`		`- snprintf(buffer, sizeof(buffer), "1e+9999");`
	`101`	`+ len = snprintf(buffer, sizeof(buffer), "1e+9999");`
`106`	`102`	`}`
	`103`	`+ // For those, we do not need to call fixNumLoc, but it is fast.`
`107`	`104`	`}`
`108`	`105`	`#endif`
	`106`	`+ assert(len>=0);`
	`107`	`+ fixNumericLocale(buffer, buffer + len);`
`109`	`108`	`return buffer;`
`110`	`109`	`}`
`111`	`110`