From a7718c78e94bf6674f6dd66996ee64ae1b836904 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Sat, 15 Apr 2017 15:20:02 +0200
Subject: [PATCH] Made JSON::string_escape a public function
---
lib/json.cpp | 18 ++++++++++++------
lib/json.h | 5 ++++-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/lib/json.cpp b/lib/json.cpp
index ce27de81..cc4f3ee6 100644
--- a/lib/json.cpp
+++ b/lib/json.cpp
@@ -284,7 +284,7 @@ static std::string UTF16(uint32_t c){
}
}
-static std::string string_escape(const std::string val) {
+std::string JSON::string_escape(const std::string & val) {
std::string out = "\"";
for (unsigned int i = 0; i < val.size(); ++i) {
const char & c = val.data()[i];
@@ -1059,7 +1059,7 @@ std::string JSON::Value::toString() const {
break;
}
case STRING: {
- return string_escape(strVal);
+ return JSON::string_escape(strVal);
break;
}
case ARRAY: {
@@ -1080,7 +1080,7 @@ std::string JSON::Value::toString() const {
std::string tmp2 = "{";
if (objVal.size() > 0) {
jsonForEachConst(*this, i){
- tmp2 += string_escape(i.key()) + ":";
+ tmp2 += JSON::string_escape(i.key()) + ":";
tmp2 += i->toString();
if (i.num()+1 != objVal.size()) {
tmp2 += ",";
@@ -1114,7 +1114,7 @@ std::string JSON::Value::toPrettyString(int indentation) const {
return "\"" + JSON::Value((long long int)strVal.size()).asString() + " bytes of data\"";
}
}
- return string_escape(strVal);
+ return JSON::string_escape(strVal);
break;
}
case ARRAY: {
@@ -1141,7 +1141,7 @@ std::string JSON::Value::toPrettyString(int indentation) const {
}
std::string tmp2 = "{" + std::string((shortMode ? "" : "\n"));
jsonForEachConst(*this, i){
- tmp2 += (shortMode ? std::string("") : std::string(indentation + 2, ' ')) + string_escape(i.key()) + ":";
+ tmp2 += (shortMode ? std::string("") : std::string(indentation + 2, ' ')) + JSON::string_escape(i.key()) + ":";
tmp2 += i->toPrettyString(indentation + 2);
if (i.num() + 1 != objVal.size()) {
tmp2 += "," + std::string((shortMode ? " " : "\n"));
@@ -1249,7 +1249,13 @@ unsigned int JSON::Value::size() const {
}
/// Converts a std::string to a JSON::Value.
-JSON::Value JSON::fromString(std::string json) {
+JSON::Value JSON::fromString(const char * data, const uint32_t data_len) {
+ const std::string str(data, data_len);
+ return JSON::fromString(str);
+}
+
+/// Converts a std::string to a JSON::Value.
+JSON::Value JSON::fromString(const std::string & json) {
std::istringstream is(json);
return JSON::Value(is);
}
diff --git a/lib/json.h b/lib/json.h
index 37390033..d73360fb 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -16,6 +16,8 @@ namespace JSON {
EMPTY, BOOL, INTEGER, STRING, ARRAY, OBJECT
};
+ /// JSON-string-escapes a value
+ std::string string_escape(const std::string & val);
/// A JSON::Value is either a string or an integer, but may also be an object, array or null.
class Value {
@@ -91,7 +93,8 @@ namespace JSON {
Value fromDTMI2(const unsigned char * data, unsigned int len, unsigned int & i);
Value fromDTMI(std::string & data);
Value fromDTMI(const unsigned char * data, unsigned int len, unsigned int & i);
- Value fromString(std::string json);
+ Value fromString(const std::string & json);
+ Value fromString(const char * data, const uint32_t data_len);
Value fromFile(std::string filename);
void fromDTMI2(std::string & data, Value & ret);
void fromDTMI2(const unsigned char * data, unsigned int len, unsigned int & i, Value & ret);