mirror of
https://github.com/eledio-devices/thirdparty-ArduinoJson.git
synced 2025-11-02 00:38:26 +01:00
Added a line-break after each "if" to get more accurate coverage report
This commit is contained in:
@@ -17,34 +17,41 @@ void objectAccept(const CollectionData *obj, Visitor &visitor) {
|
||||
}
|
||||
|
||||
inline bool objectEquals(const CollectionData *lhs, const CollectionData *rhs) {
|
||||
if (lhs == rhs) return true;
|
||||
if (!lhs || !rhs) return false;
|
||||
if (lhs == rhs)
|
||||
return true;
|
||||
if (!lhs || !rhs)
|
||||
return false;
|
||||
return lhs->equalsObject(*rhs);
|
||||
}
|
||||
|
||||
template <typename TAdaptedString>
|
||||
inline VariantData *objectGet(const CollectionData *obj, TAdaptedString key) {
|
||||
if (!obj) return 0;
|
||||
if (!obj)
|
||||
return 0;
|
||||
return obj->get(key);
|
||||
}
|
||||
|
||||
template <typename TAdaptedString>
|
||||
void objectRemove(CollectionData *obj, TAdaptedString key) {
|
||||
if (!obj) return;
|
||||
if (!obj)
|
||||
return;
|
||||
obj->remove(key);
|
||||
}
|
||||
|
||||
template <typename TAdaptedString>
|
||||
inline VariantData *objectGetOrCreate(CollectionData *obj, TAdaptedString key,
|
||||
MemoryPool *pool) {
|
||||
if (!obj) return 0;
|
||||
if (!obj)
|
||||
return 0;
|
||||
|
||||
// ignore null key
|
||||
if (key.isNull()) return 0;
|
||||
if (key.isNull())
|
||||
return 0;
|
||||
|
||||
// search a matching key
|
||||
VariantData *var = obj->get(key);
|
||||
if (var) return var;
|
||||
if (var)
|
||||
return var;
|
||||
|
||||
return obj->add(key, pool);
|
||||
}
|
||||
|
||||
@@ -64,7 +64,8 @@ class ObjectConstRef : public ObjectRefBase<const CollectionData>,
|
||||
ObjectConstRef(const CollectionData* data) : base_type(data) {}
|
||||
|
||||
FORCE_INLINE iterator begin() const {
|
||||
if (!_data) return iterator();
|
||||
if (!_data)
|
||||
return iterator();
|
||||
return iterator(_data->head());
|
||||
}
|
||||
|
||||
@@ -154,7 +155,8 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
|
||||
}
|
||||
|
||||
FORCE_INLINE iterator begin() const {
|
||||
if (!_data) return iterator();
|
||||
if (!_data)
|
||||
return iterator();
|
||||
return iterator(_pool, _data->head());
|
||||
}
|
||||
|
||||
@@ -163,12 +165,14 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
|
||||
}
|
||||
|
||||
void clear() const {
|
||||
if (!_data) return;
|
||||
if (!_data)
|
||||
return;
|
||||
_data->clear();
|
||||
}
|
||||
|
||||
FORCE_INLINE bool set(ObjectConstRef src) {
|
||||
if (!_data || !src._data) return false;
|
||||
if (!_data || !src._data)
|
||||
return false;
|
||||
return _data->copyFrom(*src._data, _pool);
|
||||
}
|
||||
|
||||
@@ -207,7 +211,8 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
|
||||
}
|
||||
|
||||
FORCE_INLINE void remove(iterator it) const {
|
||||
if (!_data) return;
|
||||
if (!_data)
|
||||
return;
|
||||
_data->remove(it.internal());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user