From 1ce6d663af0ddd744effa7d98b528e182cfc1e52 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 3 Nov 2014 17:03:55 +0100 Subject: [PATCH] Replaced 0 literals by more explicit '\0' and NULL --- include/ArduinoJson/Internals/StringBuilder.hpp | 2 +- include/ArduinoJson/JsonArray.hpp | 4 ++-- include/ArduinoJson/JsonObject.hpp | 4 ++-- src/Internals/QuotedString.cpp | 13 ++++++------- src/Internals/StringBuilder.cpp | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/ArduinoJson/Internals/StringBuilder.hpp b/include/ArduinoJson/Internals/StringBuilder.hpp index 31a978a2..ed720595 100644 --- a/include/ArduinoJson/Internals/StringBuilder.hpp +++ b/include/ArduinoJson/Internals/StringBuilder.hpp @@ -14,7 +14,7 @@ class StringBuilder : public Print { public: StringBuilder(char *buf, int size) : buffer(buf), capacity(size - 1), length(0) { - buffer[0] = 0; + buffer[0] = '\0'; } virtual size_t write(uint8_t c); diff --git a/include/ArduinoJson/JsonArray.hpp b/include/ArduinoJson/JsonArray.hpp index 1d6fb52d..8c94f131 100644 --- a/include/ArduinoJson/JsonArray.hpp +++ b/include/ArduinoJson/JsonArray.hpp @@ -49,10 +49,10 @@ class JsonArray : public JsonPrintable, JsonObject &createNestedObject(); iterator begin() { return iterator(_firstNode); } - iterator end() { return iterator(0); } + iterator end() { return iterator(NULL); } const_iterator begin() const { return const_iterator(_firstNode); } - const_iterator end() const { return const_iterator(0); } + const_iterator end() const { return const_iterator(NULL); } static JsonArray &invalid() { return _invalid; } diff --git a/include/ArduinoJson/JsonObject.hpp b/include/ArduinoJson/JsonObject.hpp index c4f9a4fb..af75a044 100644 --- a/include/ArduinoJson/JsonObject.hpp +++ b/include/ArduinoJson/JsonObject.hpp @@ -51,10 +51,10 @@ class JsonObject : public JsonPrintable, JsonObject &createNestedObject(key_type key); iterator begin() { return iterator(_firstNode); } - iterator end() { return iterator(0); } + iterator end() { return iterator(NULL); } const_iterator begin() const { return const_iterator(_firstNode); } - const_iterator end() const { return const_iterator(0); } + const_iterator end() const { return const_iterator(NULL); } static JsonObject &invalid() { return _invalid; } diff --git a/src/Internals/QuotedString.cpp b/src/Internals/QuotedString.cpp index 0f9a8352..193af003 100644 --- a/src/Internals/QuotedString.cpp +++ b/src/Internals/QuotedString.cpp @@ -23,8 +23,7 @@ static inline char getSpecialChar(char c) { static inline size_t printCharTo(char c, Print *p) { char specialChar = getSpecialChar(c); - return specialChar != 0 ? p->write('\\') + p->write(specialChar) - : p->write(c); + return specialChar ? p->write('\\') + p->write(specialChar) : p->write(c); } size_t QuotedString::printTo(const char *s, Print *p) { @@ -45,7 +44,7 @@ static char unescapeChar(char c) { const char *p = "b\bf\fn\nr\rt\t"; for (;;) { - if (p[0] == 0) return c; + if (p[0] == '\0') return c; if (p[0] == c) return p[1]; p += 2; } @@ -58,7 +57,7 @@ char *QuotedString::extractFrom(char *input, char **endPtr) { if (!isQuote(firstChar)) { // must start with a quote - return 0; + return NULL; } char stopChar = firstChar; // closing quote is the same as opening quote @@ -71,9 +70,9 @@ char *QuotedString::extractFrom(char *input, char **endPtr) { for (;;) { c = *readPtr++; - if (c == 0) { + if (c == '\0') { // premature ending - return 0; + return NULL; } if (c == stopChar) { @@ -90,7 +89,7 @@ char *QuotedString::extractFrom(char *input, char **endPtr) { } // end the string here - *writePtr = 0; + *writePtr = '\0'; // update end ptr *endPtr = readPtr; diff --git a/src/Internals/StringBuilder.cpp b/src/Internals/StringBuilder.cpp index e35e5694..f38c38fe 100644 --- a/src/Internals/StringBuilder.cpp +++ b/src/Internals/StringBuilder.cpp @@ -12,6 +12,6 @@ size_t StringBuilder::write(uint8_t c) { if (length >= capacity) return 0; buffer[length++] = c; - buffer[length] = 0; + buffer[length] = '\0'; return 1; }