diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2015-12-02 12:28:14 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2015-12-02 12:28:48 +0100 |
| commit | fad4ea836dc7cd1bb13c7394a6fadff419e4b026 (patch) | |
| tree | ff7f84f4820a67a433c25e42b7914f3fced26193 /src/univalue/lib/univalue_write.cpp | |
| parent | 1b0241fcec3e00d13658090e26cfa1f05133116e (diff) | |
| parent | 982709199f1b4e9e35211c419a81938f9f1dd4ed (diff) | |
Merge commit '982709199f1b4e9e35211c419a81938f9f1dd4ed' into bitcoin
Diffstat (limited to 'src/univalue/lib/univalue_write.cpp')
| -rw-r--r-- | src/univalue/lib/univalue_write.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/univalue/lib/univalue_write.cpp b/src/univalue/lib/univalue_write.cpp index bce3997af7..ceb4cc9166 100644 --- a/src/univalue/lib/univalue_write.cpp +++ b/src/univalue/lib/univalue_write.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <ctype.h> #include <iomanip> #include <sstream> #include <stdio.h> @@ -25,10 +24,10 @@ static string json_escape(const string& inS) if (escStr) outS += escStr; - else if (isprint(ch)) + else if (ch < 0x80) outS += ch; - else { + else { // TODO handle UTF-8 properly char tmpesc[16]; sprintf(tmpesc, "\\u%04x", ch); outS += tmpesc; @@ -113,7 +112,7 @@ void UniValue::writeObject(unsigned int prettyIndent, unsigned int indentLevel, s += "\"" + json_escape(keys[i]) + "\":"; if (prettyIndent) s += " "; - s += values[i].write(prettyIndent, indentLevel + 1); + s += values.at(i).write(prettyIndent, indentLevel + 1); if (i != (values.size() - 1)) s += ","; if (prettyIndent) |