src: Improving consistency and correcting code style
As of this commit, all data structures can be directly constructed from
wire format.
This commit excludes full correction of code style in security/ and
tools/ndnsec*, which will be part of a different commit.
Change-Id: I121ac1f81948bc7468990df52cdefeb2988d91a1
Refs: #1403
diff --git a/src/meta-info.hpp b/src/meta-info.hpp
index 8042f8b..4153911 100644
--- a/src/meta-info.hpp
+++ b/src/meta-info.hpp
@@ -28,6 +28,9 @@
{
}
+ /**
+ * @brief Create from wire encoding
+ */
MetaInfo(const Block& block)
{
wireDecode(block);
@@ -118,30 +121,30 @@
// FreshnessPeriod?
// FinalBlockId?
- size_t total_len = 0;
+ size_t totalLength = 0;
// FinalBlockId
if (!m_finalBlockId.empty())
{
- total_len += prependNestedBlock(blk, Tlv::FinalBlockId, m_finalBlockId);
+ totalLength += prependNestedBlock(blk, Tlv::FinalBlockId, m_finalBlockId);
}
// FreshnessPeriod
if (m_freshnessPeriod >= time::milliseconds::zero())
{
- total_len += prependNonNegativeIntegerBlock(blk, Tlv::FreshnessPeriod,
- m_freshnessPeriod.count());
+ totalLength += prependNonNegativeIntegerBlock(blk, Tlv::FreshnessPeriod,
+ m_freshnessPeriod.count());
}
// ContentType
if (m_type != TYPE_DEFAULT)
{
- total_len += prependNonNegativeIntegerBlock(blk, Tlv::ContentType, m_type);
+ totalLength += prependNonNegativeIntegerBlock(blk, Tlv::ContentType, m_type);
}
- total_len += blk.prependVarNumber(total_len);
- total_len += blk.prependVarNumber(Tlv::MetaInfo);
- return total_len;
+ totalLength += blk.prependVarNumber(totalLength);
+ totalLength += blk.prependVarNumber(Tlv::MetaInfo);
+ return totalLength;
}
inline const Block&