bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-17 20:42:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced 0 literals by more explicit '\0' and NULL

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-03 17:03:55 +01:00
parent c1c63067d4
commit 1ce6d663af
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ class StringBuilder : public Print {
public: public:
StringBuilder(char *buf, int size) StringBuilder(char *buf, int size)
: buffer(buf), capacity(size - 1), length(0) { : buffer(buf), capacity(size - 1), length(0) {
buffer[0] = 0; buffer[0] = '\0';
} }
virtual size_t write(uint8_t c); virtual size_t write(uint8_t c);

4
include/ArduinoJson/JsonArray.hpp
View File

@ -49,10 +49,10 @@ class JsonArray : public JsonPrintable<JsonArray>,
JsonObject &createNestedObject(); JsonObject &createNestedObject();
iterator begin() { return iterator(_firstNode); } 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 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; } static JsonArray &invalid() { return _invalid; }

4
include/ArduinoJson/JsonObject.hpp
View File

@ -51,10 +51,10 @@ class JsonObject : public JsonPrintable<JsonObject>,
JsonObject &createNestedObject(key_type key); JsonObject &createNestedObject(key_type key);
iterator begin() { return iterator(_firstNode); } 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 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; } static JsonObject &invalid() { return _invalid; }

13
src/Internals/QuotedString.cpp
View File

@ -23,8 +23,7 @@ static inline char getSpecialChar(char c) {
static inline size_t printCharTo(char c, Print *p) { static inline size_t printCharTo(char c, Print *p) {
char specialChar = getSpecialChar(c); char specialChar = getSpecialChar(c);
return specialChar != 0 ? p->write('\\') + p->write(specialChar) return specialChar ? p->write('\\') + p->write(specialChar) : p->write(c);
: p->write(c);
} }
size_t QuotedString::printTo(const char *s, Print *p) { 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"; const char *p = "b\bf\fn\nr\rt\t";
for (;;) { for (;;) {
if (p[0] == 0) return c; if (p[0] == '\0') return c;
if (p[0] == c) return p[1]; if (p[0] == c) return p[1];
p += 2; p += 2;
} }
@ -58,7 +57,7 @@ char *QuotedString::extractFrom(char *input, char **endPtr) {
if (!isQuote(firstChar)) { if (!isQuote(firstChar)) {
// must start with a quote // must start with a quote
return 0; return NULL;
} }
char stopChar = firstChar; // closing quote is the same as opening quote char stopChar = firstChar; // closing quote is the same as opening quote
@ -71,9 +70,9 @@ char *QuotedString::extractFrom(char *input, char **endPtr) {
for (;;) { for (;;) {
c = *readPtr++; c = *readPtr++;
if (c == 0) { if (c == '\0') {
// premature ending // premature ending
return 0; return NULL;
} }
if (c == stopChar) { if (c == stopChar) {
@ -90,7 +89,7 @@ char *QuotedString::extractFrom(char *input, char **endPtr) {
} }
// end the string here // end the string here
*writePtr = 0; *writePtr = '\0';
// update end ptr // update end ptr
*endPtr = readPtr; *endPtr = readPtr;

2
src/Internals/StringBuilder.cpp
View File

@ -12,6 +12,6 @@ size_t StringBuilder::write(uint8_t c) {
if (length >= capacity) return 0; if (length >= capacity) return 0;
buffer[length++] = c; buffer[length++] = c;
buffer[length] = 0; buffer[length] = '\0';
return 1; return 1;
} }