Просмотр исходного кода

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

Benoit Blanchon 11 лет назад
Родитель
Сommit
1ce6d663af

+ 1 - 1
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);

+ 2 - 2
include/ArduinoJson/JsonArray.hpp

@@ -49,10 +49,10 @@ class JsonArray : public JsonPrintable<JsonArray>,
   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; }
 

+ 2 - 2
include/ArduinoJson/JsonObject.hpp

@@ -51,10 +51,10 @@ class JsonObject : public JsonPrintable<JsonObject>,
   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; }
 

+ 6 - 7
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;

+ 1 - 1
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;
 }