wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: added missing commas 

fix: const char* were being cast to bool
This commit is contained in:
Evan Tschannen 2018-09-09 19:08:54 -07:00
parent 84737b1fbe
commit aacba2c9db
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fdbclient/JsonString.h
View File

@ -139,6 +139,24 @@ protected:
write('"');
}
void writeValue(const char* val) {
write('"');
int beginCopy = 0;
int len = strlen(val);
for (int i = 0; i < len; i++) {
if (shouldEscape(val[i])) {
jsonText.back().append(arena, (const uint8_t*)&(val[beginCopy]), i - beginCopy);
beginCopy = i + 1;
write('\\');
write(val[i]);
}
}
if(beginCopy < len) {
jsonText.back().append(arena, (const uint8_t*)&(val[beginCopy]), len - beginCopy);
}
write('"');
}
// Write the finalized (closed) form of val
void writeValue(const JsonBuilder &val) {
bytes += val.bytes;
@ -192,6 +210,10 @@ public:
return *this;
}
if(elements > 0) {
write(',');
}
bytes += arr.bytes - 1;
jsonText.push_back(VectorRef<uint8_t>((uint8_t*)&arr.jsonText[0][1], arr.jsonText[0].size()-1));
for(int i = 1; i < arr.jsonText.size(); i++) {
@ -238,6 +260,10 @@ public:
return *this;
}
if(elements > 0) {
write(',');
}
bytes += obj.bytes - 1;
jsonText.push_back(VectorRef<uint8_t>((uint8_t*)&obj.jsonText[0][1], obj.jsonText[0].size()-1));
for(int i = 1; i < obj.jsonText.size(); i++) {