Merge pull request open-source-parsers#30 from mloy/redundant-strlen

cdunn2001 · cdunn2001 · commit 033677cc1a06 · 2014-09-03T14:07:40.000-07:00
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -105,8 +105,7 @@ static inline char *duplicateStringValue(const char *value,
 /** Free the string duplicated by duplicateStringValue().
  */
 static inline void releaseStringValue(char *value) {
-  if (value)
-    free(value);
+  free(value);
 }
 
 } // namespace Json
diff --git 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
@@ -75,36 +76,35 @@ std::string valueToString(double value) {
                                                       // visual studio 2005 to
                                                       // avoid warning.
   #if defined(WINCE)
-  _snprintf(buffer, sizeof(buffer), "%.16g", value);
+  len = _snprintf(buffer, sizeof(buffer), "%.16g", value);
   #else
-  sprintf_s(buffer, sizeof(buffer), "%.16g", value);
+  len = sprintf_s(buffer, sizeof(buffer), "%.16g", value);
   #endif
 #else
   if ( isfinite( value ))
   {
-     snprintf(buffer, sizeof(buffer), "%.16g", value);
+    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");
      }
-     // nothing more to do, return.
-     return buffer;
+     // For those, we do not need to call fixNumLoc, but it is fast.
   }
-
 #endif
-  fixNumericLocale(buffer, buffer + strlen(buffer));
+  assert(len>=0);
+  fixNumericLocale(buffer, buffer + len);
   return buffer;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,7 @@ static inline char duplicateStringValue(const char value,`
`105`	`105`	`/** Free the string duplicated by duplicateStringValue().`
`106`	`106`	`*/`
`107`	`107`	`static inline void releaseStringValue(char *value) {`
`108`		`- if (value)`
`109`		`- free(value);`
	`108`	`+ free(value);`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`} // namespace Json`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ 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`
`@@ -75,36 +76,35 @@ std::string valueToString(double value) {`
`75`	`76`	`// visual studio 2005 to`
`76`	`77`	`// avoid warning.`
`77`	`78`	`#if defined(WINCE)`
`78`		`- _snprintf(buffer, sizeof(buffer), "%.16g", value);`
	`79`	`+ len = _snprintf(buffer, sizeof(buffer), "%.16g", value);`
`79`	`80`	`#else`
`80`		`- sprintf_s(buffer, sizeof(buffer), "%.16g", value);`
	`81`	`+ len = sprintf_s(buffer, sizeof(buffer), "%.16g", value);`
`81`	`82`	`#endif`
`82`	`83`	`#else`
`83`	`84`	`if ( isfinite( value ))`
`84`	`85`	`{`
`85`		`- snprintf(buffer, sizeof(buffer), "%.16g", value);`
	`86`	`+ len = snprintf(buffer, sizeof(buffer), "%.16g", value);`
`86`	`87`	`}`
`87`	`88`	`else`
`88`	`89`	`{`
`89`	`90`	`// IEEE standard states that NaN values will not compare to themselves`
`90`	`91`	`if ( value != value)`
`91`	`92`	`{`
`92`		`- snprintf(buffer, sizeof(buffer), "null");`
	`93`	`+ len = snprintf(buffer, sizeof(buffer), "null");`
`93`	`94`	`}`
`94`	`95`	`else if ( value < 0)`
`95`	`96`	`{`
`96`		`- snprintf(buffer, sizeof(buffer), "-1e+9999");`
	`97`	`+ len = snprintf(buffer, sizeof(buffer), "-1e+9999");`
`97`	`98`	`}`
`98`	`99`	`else`
`99`	`100`	`{`
`100`		`- snprintf(buffer, sizeof(buffer), "1e+9999");`
	`101`	`+ len = snprintf(buffer, sizeof(buffer), "1e+9999");`
`101`	`102`	`}`
`102`		`- // nothing more to do, return.`
`103`		`- return buffer;`
	`103`	`+ // For those, we do not need to call fixNumLoc, but it is fast.`
`104`	`104`	`}`
`105`		`-`
`106`	`105`	`#endif`
`107`		`- fixNumericLocale(buffer, buffer + strlen(buffer));`
	`106`	`+ assert(len>=0);`
	`107`	`+ fixNumericLocale(buffer, buffer + len);`
`108`	`108`	`return buffer;`
`109`	`109`	`}`
`110`	`110`