Fix open-source-parsers#296: Explicitly cast size_t results to unsigned when needed

fivemicro · fivemicro · commit 02cfae64319a · 2015-07-01T14:23:13.000-07:00
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -125,7 +125,7 @@ inline static void decodePrefixedString(
     unsigned* length, char const** value)
 {
   if (!isPrefixed) {
-    *length = strlen(prefixed);
+    *length = static_cast<unsigned>(strlen(prefixed));
     *value = prefixed;
   } else {
     *length = *reinterpret_cast<unsigned const*>(prefixed);
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -346,7 +346,7 @@ void FastWriter::writeValue(const Value& value) {
       const std::string& name = *it;
       if (it != members.begin())
         document_ += ',';
-      document_ += valueToQuotedStringN(name.data(), name.length());
+      document_ += valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length()));
       document_ += yamlCompatiblityEnabled_ ? ": " : ":";
       writeValue(value[name]);
     }
@@ -906,7 +906,7 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
         std::string const& name = *it;
         Value const& childValue = value[name];
         writeCommentBeforeValue(childValue);
-        writeWithIndent(valueToQuotedStringN(name.data(), name.length()));
+        writeWithIndent(valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length())));
         *sout_ << colonSymbol_;
         writeValue(childValue);
         if (++it == members.end()) {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ inline static void decodePrefixedString(`
`125`	`125`	`unsigned* length, char const** value)`
`126`	`126`	`{`
`127`	`127`	`if (!isPrefixed) {`
`128`		`- *length = strlen(prefixed);`
	`128`	`+ *length = static_cast<unsigned>(strlen(prefixed));`
`129`	`129`	`*value = prefixed;`
`130`	`130`	`} else {`
`131`	`131`	`length = reinterpret_cast<unsigned const*>(prefixed);`