feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Reduced size by 22 bytes by removing writeEmptyArray() and writeEmptyObject()

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-09 13:54:03 +01:00
parent 12e374d0da
commit 3919f07890
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ArduinoJson/Internals/JsonWriter.hpp
View File

@ -30,11 +30,9 @@ class JsonWriter {
void beginArray() { write('['); } void beginArray() { write('['); }
void endArray() { write(']'); } void endArray() { write(']'); }
void writeEmptyArray() { write("[]"); }
void beginObject() { write('{'); } void beginObject() { write('{'); }
void endObject() { write('}'); } void endObject() { write('}'); }
void writeEmptyObject() { write("{}"); }
void writeColon() { write(':'); } void writeColon() { write(':'); }
void writeComma() { write(','); } void writeComma() { write(','); }

9
src/JsonArray.cpp
View File

@ -44,12 +44,10 @@ JsonObject &JsonArray::createNestedObject() {
} }
void JsonArray::writeTo(JsonWriter &writer) const { void JsonArray::writeTo(JsonWriter &writer) const {
node_type *child = _firstNode;
if (child) {
writer.beginArray(); writer.beginArray();
for (;;) { const node_type *child = _firstNode;
while (child) {
child->content.writeTo(writer); child->content.writeTo(writer);
child = child->next; child = child->next;
@ -59,7 +57,4 @@ void JsonArray::writeTo(JsonWriter &writer) const {
} }
writer.endArray(); writer.endArray();
} else {
writer.writeEmptyArray();
}
} }

9
src/JsonObject.cpp
View File

@ -68,12 +68,10 @@ JsonObject::node_type *JsonObject::getNodeAt(const char *key) const {
} }
void JsonObject::writeTo(JsonWriter &writer) const { void JsonObject::writeTo(JsonWriter &writer) const {
node_type *node = _firstNode;
if (node) {
writer.beginObject(); writer.beginObject();
for (;;) { const node_type *node = _firstNode;
while (node) {
writer.writeString(node->content.key); writer.writeString(node->content.key);
writer.writeColon(); writer.writeColon();
node->content.value.writeTo(writer); node->content.value.writeTo(writer);
@ -85,7 +83,4 @@ void JsonObject::writeTo(JsonWriter &writer) const {
} }
writer.endObject(); writer.endObject();
} else {
writer.writeEmptyObject();
}
} }