neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #4851

Browse Source 
41ef558 univalue: make spaceStr thread-safe (Wladimir J. van der Laan)
This commit is contained in:
Pieter Wuille 2014-09-06 21:09:50 +02:00
commit 93193c8ffd
No known key found for this signature in database
GPG Key ID: 8F653255C87992E0
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/univalue/univalue_write.cpp
View File

@ -70,15 +70,9 @@ string UniValue::write(unsigned int prettyIndent,
return s; return s;
} }
static string spaceStr; static void indentStr(unsigned int prettyIndent, unsigned int indentLevel, string& s)
static string indentStr(unsigned int prettyIndent, unsigned int indentLevel)
{ {
unsigned int spaces = prettyIndent * indentLevel; s.append(prettyIndent * indentLevel, ' ');
while (spaceStr.size() < spaces)
spaceStr += " ";
return spaceStr.substr(0, spaces);
} }
void UniValue::writeArray(unsigned int prettyIndent, unsigned int indentLevel, string& s) const void UniValue::writeArray(unsigned int prettyIndent, unsigned int indentLevel, string& s) const
@ -89,7 +83,7 @@ void UniValue::writeArray(unsigned int prettyIndent, unsigned int indentLevel, s
for (unsigned int i = 0; i < values.size(); i++) { for (unsigned int i = 0; i < values.size(); i++) {
if (prettyIndent) if (prettyIndent)
s += indentStr(prettyIndent, indentLevel); indentStr(prettyIndent, indentLevel, s);
s += values[i].write(prettyIndent, indentLevel + 1); s += values[i].write(prettyIndent, indentLevel + 1);
if (i != (values.size() - 1)) { if (i != (values.size() - 1)) {
s += ","; s += ",";
@ -101,7 +95,7 @@ void UniValue::writeArray(unsigned int prettyIndent, unsigned int indentLevel, s
} }
if (prettyIndent) if (prettyIndent)
s += indentStr(prettyIndent, indentLevel - 1); indentStr(prettyIndent, indentLevel - 1, s);
s += "]"; s += "]";
} }
@ -113,7 +107,7 @@ void UniValue::writeObject(unsigned int prettyIndent, unsigned int indentLevel,
for (unsigned int i = 0; i < keys.size(); i++) { for (unsigned int i = 0; i < keys.size(); i++) {
if (prettyIndent) if (prettyIndent)
s += indentStr(prettyIndent, indentLevel); indentStr(prettyIndent, indentLevel, s);
s += "\"" + json_escape(keys[i]) + "\":"; s += "\"" + json_escape(keys[i]) + "\":";
if (prettyIndent) if (prettyIndent)
s += " "; s += " ";
@ -125,7 +119,7 @@ void UniValue::writeObject(unsigned int prettyIndent, unsigned int indentLevel,
} }
if (prettyIndent) if (prettyIndent)
s += indentStr(prettyIndent, indentLevel - 1); indentStr(prettyIndent, indentLevel - 1, s);
s += "}"; s += "}";
} }