From 0db9a805bde5050060913462299690020ff798a0 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 22 Oct 2013 05:43:38 -0400 Subject: Revert "Switch to using raw_utf8" This reverts commit 2ecb7555a9df1e843fd25f588819e4ca1d94b266. --- src/bitcoinrpc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/bitcoinrpc.cpp') diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 93ab9a477..4d0767e43 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -533,7 +533,7 @@ string JSONRPCRequest(const string& strMethod, const Array& params, const Value& request.push_back(Pair("method", strMethod)); request.push_back(Pair("params", params)); request.push_back(Pair("id", id)); - return write_string(Value(request), raw_utf8) + "\n"; + return write_string(Value(request), false) + "\n"; } Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id) @@ -551,7 +551,7 @@ Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id) string JSONRPCReply(const Value& result, const Value& error, const Value& id) { Object reply = JSONRPCReplyObj(result, error, id); - return write_string(Value(reply), raw_utf8) + "\n"; + return write_string(Value(reply), false) + "\n"; } void ErrorReply(std::ostream& stream, const Object& objError, const Value& id) @@ -982,7 +982,7 @@ static string JSONRPCExecBatch(const Array& vReq) for (unsigned int reqIdx = 0; reqIdx < vReq.size(); reqIdx++) ret.push_back(JSONRPCExecOne(vReq[reqIdx])); - return write_string(Value(ret), raw_utf8) + "\n"; + return write_string(Value(ret), false) + "\n"; } void ServiceConnection(AcceptedConnection *conn) @@ -1284,7 +1284,7 @@ int CommandLineRPC(int argc, char *argv[]) if (error.type() != null_type) { // Error - strPrint = "error: " + write_string(error, raw_utf8); + strPrint = "error: " + write_string(error, false); int code = find_value(error.get_obj(), "code").get_int(); nRet = abs(code); } @@ -1296,7 +1296,7 @@ int CommandLineRPC(int argc, char *argv[]) else if (result.type() == str_type) strPrint = result.get_str(); else - strPrint = write_string(result, pretty_print | raw_utf8); + strPrint = write_string(result, true); } } catch (boost::thread_interrupted) { -- cgit v1.2.3 From 406b1f05f61a7bba7ef6860c031a7a7c3e019100 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 22 Oct 2013 05:43:46 -0400 Subject: Revert "JSON Spirit updated to v4.06" This reverts commit 2227389fa8fa1b9ff19234838fc7b641e935125b. --- src/bitcoinrpc.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/bitcoinrpc.cpp') diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 4d0767e43..f2a52e92e 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -31,8 +31,6 @@ using namespace boost; using namespace boost::asio; using namespace json_spirit; -static const char* Value_type_name[]={"obj", "array", "str", "bool", "int", "real", "null"}; - static std::string strRPCUserColonPass; // These are created by StartRPCThreads, destroyed in StopRPCThreads -- cgit v1.2.3