diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-02 13:26:52 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-02 13:26:54 +0100 |
| commit | 7c7a05d27477c21420a66b96085e417c85542e9f (patch) | |
| tree | 9d642d27fbbd0918cd5199186e224191911cc63d /src/univalue/lib/univalue_write.cpp | |
| parent | 0dd194c917db4dcc19731b6c1ae6fd1a1395c1f7 (diff) | |
| parent | fad4ea836dc7cd1bb13c7394a6fadff419e4b026 (diff) | |
| download | bitcoin-7c7a05d27477c21420a66b96085e417c85542e9f.tar.xz | |
Merge pull request #7147
9827091 Squashed 'src/univalue/' changes from 5839ac3..2740c4f (MarcoFalke)
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) |