Added a line-break after each "if" to get more accurate coverage report

src/ArduinoJson/Variant/SlotFunctions.hpp

@@ -11,12 +11,14 @@ namespace ARDUINOJSON_NAMESPACE {
 
 template <typename TAdaptedString>
 inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool* pool) {
-  if (!var) return false;
+  if (!var)
+    return false;
   if (key.isStatic()) {
     var->setLinkedKey(make_not_null(key.data()));
   } else {
     const char* dup = key.save(pool);
-    if (!dup) return false;
+    if (!dup)
+      return false;
     var->setOwnedKey(make_not_null(dup));
   }
   return true;

src/ArduinoJson/Variant/VariantAsImpl.hpp

@@ -32,7 +32,8 @@ template <typename T>
 inline typename enable_if<IsWriteableString<T>::value, T>::type variantAs(
     const VariantData* _data) {
   const char* cstr = _data != 0 ? _data->asString() : 0;
-  if (cstr) return T(cstr);
+  if (cstr)
+    return T(cstr);
   T s;
   serializeJson(VariantConstRef(_data), s);
   return s;

src/ArduinoJson/Variant/VariantData.hpp

@@ -185,12 +185,14 @@ class VariantData {
   }
 
   void remove(size_t index) {
-    if (isArray()) _content.asCollection.remove(index);
+    if (isArray())
+      _content.asCollection.remove(index);
   }
 
   template <typename TAdaptedString>
   void remove(TAdaptedString key) {
-    if (isObject()) _content.asCollection.remove(key);
+    if (isObject())
+      _content.asCollection.remove(key);
   }
 
   void setBoolean(bool value) {
@@ -329,8 +331,10 @@ class VariantData {
   }
 
   VariantData *addElement(MemoryPool *pool) {
-    if (isNull()) toArray();
-    if (!isArray()) return 0;
+    if (isNull())
+      toArray();
+    if (!isArray())
+      return 0;
     return _content.asCollection.add(pool);
   }
 
@@ -345,15 +349,19 @@ class VariantData {
 
   template <typename TAdaptedString>
   VariantData *getOrAddMember(TAdaptedString key, MemoryPool *pool) {
-    if (isNull()) toObject();
-    if (!isObject()) return 0;
+    if (isNull())
+      toObject();
+    if (!isObject())
+      return 0;
     VariantData *var = _content.asCollection.get(key);
-    if (var) return var;
+    if (var)
+      return var;
     return _content.asCollection.add(key, pool);
   }
 
   void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
-    if (_flags & VALUE_IS_OWNED) _content.asString += stringDistance;
+    if (_flags & VALUE_IS_OWNED)
+      _content.asString += stringDistance;
     if (_flags & COLLECTION_MASK)
       _content.asCollection.movePointers(stringDistance, variantDistance);
   }

src/ArduinoJson/Variant/VariantFunctions.hpp

@@ -30,7 +30,8 @@ inline CollectionData *variantAsObject(VariantData *var) {
 
 inline bool variantCopyFrom(VariantData *dst, const VariantData *src,
                             MemoryPool *pool) {
-  if (!dst) return false;
+  if (!dst)
+    return false;
   if (!src) {
     dst->setNull();
     return true;
@@ -39,8 +40,10 @@ inline bool variantCopyFrom(VariantData *dst, const VariantData *src,
 }
 
 inline bool variantEquals(const VariantData *a, const VariantData *b) {
-  if (a == b) return true;
-  if (!a || !b) return false;
+  if (a == b)
+    return true;
+  if (!a || !b)
+    return false;
   return a->equals(*b);
 }
 
@@ -74,20 +77,23 @@ inline bool variantIsNull(const VariantData *var) {
 }
 
 inline bool variantSetBoolean(VariantData *var, bool value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setBoolean(value);
   return true;
 }
 
 inline bool variantSetFloat(VariantData *var, Float value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setFloat(value);
   return true;
 }
 
 inline bool variantSetLinkedRaw(VariantData *var,
                                 SerializedValue<const char *> value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setLinkedRaw(value);
   return true;
 }
@@ -100,24 +106,28 @@ inline bool variantSetOwnedRaw(VariantData *var, SerializedValue<T> value,
 
 template <typename T>
 inline bool variantSetSignedInteger(VariantData *var, T value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setSignedInteger(value);
   return true;
 }
 
 inline bool variantSetLinkedString(VariantData *var, const char *value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setLinkedString(value);
   return true;
 }
 
 inline void variantSetNull(VariantData *var) {
-  if (!var) return;
+  if (!var)
+    return;
   var->setNull();
 }
 
 inline bool variantSetOwnedString(VariantData *var, char *value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setOwnedString(value);
   return true;
 }
@@ -128,7 +138,8 @@ inline bool variantSetOwnedString(VariantData *var, T value, MemoryPool *pool) {
 }
 
 inline bool variantSetUnsignedInteger(VariantData *var, UInt value) {
-  if (!var) return false;
+  if (!var)
+    return false;
   var->setUnsignedInteger(value);
   return true;
 }
@@ -138,12 +149,14 @@ inline size_t variantSize(const VariantData *var) {
 }
 
 inline CollectionData *variantToArray(VariantData *var) {
-  if (!var) return 0;
+  if (!var)
+    return 0;
   return &var->toArray();
 }
 
 inline CollectionData *variantToObject(VariantData *var) {
-  if (!var) return 0;
+  if (!var)
+    return 0;
   return &var->toObject();
 }
 

src/ArduinoJson/Variant/VariantRef.hpp

@@ -324,7 +324,8 @@ class VariantRef : public VariantRefBase<VariantData>,
   FORCE_INLINE VariantRef getOrAddMember(const TString &) const;
 
   FORCE_INLINE void remove(size_t index) const {
-    if (_data) _data->remove(index);
+    if (_data)
+      _data->remove(index);
   }
   // remove(char*) const
   // remove(const char*) const
@@ -332,14 +333,16 @@ class VariantRef : public VariantRefBase<VariantData>,
   template <typename TChar>
   FORCE_INLINE typename enable_if<IsString<TChar *>::value>::type remove(
       TChar *key) const {
-    if (_data) _data->remove(adaptString(key));
+    if (_data)
+      _data->remove(adaptString(key));
   }
   // remove(const std::string&) const
   // remove(const String&) const
   template <typename TString>
   FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
       const TString &key) const {
-    if (_data) _data->remove(adaptString(key));
+    if (_data)
+      _data->remove(adaptString(key));
   }
 
  private:

src/ArduinoJson/Variant/VariantSlot.hpp

@@ -49,7 +49,8 @@ class VariantSlot {
   VariantSlot* next(size_t distance) {
     VariantSlot* slot = this;
     while (distance--) {
-      if (!slot->_next) return 0;
+      if (!slot->_next)
+        return 0;
       slot += slot->_next;
     }
     return slot;
@@ -93,8 +94,10 @@ class VariantSlot {
   }
 
   void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
-    if (_flags & KEY_IS_OWNED) _key += stringDistance;
-    if (_flags & VALUE_IS_OWNED) _content.asString += stringDistance;
+    if (_flags & KEY_IS_OWNED)
+      _key += stringDistance;
+    if (_flags & VALUE_IS_OWNED)
+      _content.asString += stringDistance;
     if (_flags & COLLECTION_MASK)
       _content.asCollection.movePointers(stringDistance, variantDistance);
   }