From 9e5f41ed6ebe64a789916794626485460078c420 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Sat, 19 Jan 2019 01:29:33 +0100 Subject: - Code style fix - Improved vpp binary api interface - Correction in object pool destructor - Fix error in Memif Connector Change-Id: Id1dd9219fc1ac0b3717ae019ebff17373bebc635 Signed-off-by: Mauro Sardara --- .../hicn/transport/core/manifest_format_fixed.h | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) mode change 100755 => 100644 libtransport/src/hicn/transport/core/manifest_format_fixed.h (limited to 'libtransport/src/hicn/transport/core/manifest_format_fixed.h') diff --git a/libtransport/src/hicn/transport/core/manifest_format_fixed.h b/libtransport/src/hicn/transport/core/manifest_format_fixed.h old mode 100755 new mode 100644 index 66825e2f4..82817ddfb --- a/libtransport/src/hicn/transport/core/manifest_format_fixed.h +++ b/libtransport/src/hicn/transport/core/manifest_format_fixed.h @@ -53,7 +53,7 @@ struct Fixed { using Encoder = FixedManifestEncoder; using Decoder = FixedManifestDecoder; using HashType = utils::CryptoHash; - using SuffixList = std::list>; + using SuffixList = std::list>; }; struct Flags { @@ -83,60 +83,60 @@ static const constexpr std::uint8_t manifest_version = 1; class FixedManifestEncoder : public ManifestEncoder { public: - FixedManifestEncoder(Packet& packet); + FixedManifestEncoder(Packet &packet); ~FixedManifestEncoder(); - FixedManifestEncoder& encodeImpl(); + FixedManifestEncoder &encodeImpl(); - FixedManifestEncoder& clearImpl(); + FixedManifestEncoder &clearImpl(); - FixedManifestEncoder& setManifestTypeImpl(ManifestType manifest_type); + FixedManifestEncoder &setManifestTypeImpl(ManifestType manifest_type); - FixedManifestEncoder& setHashAlgorithmImpl(HashAlgorithm algorithm); + FixedManifestEncoder &setHashAlgorithmImpl(HashAlgorithm algorithm); - FixedManifestEncoder& setNextSegmentCalculationStrategyImpl( + FixedManifestEncoder &setNextSegmentCalculationStrategyImpl( NextSegmentCalculationStrategy strategy); - FixedManifestEncoder& setBaseNameImpl(const core::Name& base_name); + FixedManifestEncoder &setBaseNameImpl(const core::Name &base_name); - FixedManifestEncoder& addSuffixAndHashImpl(uint32_t suffix, - const utils::CryptoHash& hash); + FixedManifestEncoder &addSuffixAndHashImpl(uint32_t suffix, + const utils::CryptoHash &hash); - FixedManifestEncoder& setIsFinalManifestImpl(bool is_last); + FixedManifestEncoder &setIsFinalManifestImpl(bool is_last); - FixedManifestEncoder& setVersionImpl(ManifestVersion version); + FixedManifestEncoder &setVersionImpl(ManifestVersion version); std::size_t estimateSerializedLengthImpl(std::size_t additional_entries = 0); - FixedManifestEncoder& updateImpl(); + FixedManifestEncoder &updateImpl(); - FixedManifestEncoder& setFinalBlockNumberImpl( + FixedManifestEncoder &setFinalBlockNumberImpl( std::uint32_t final_block_number); static std::size_t getManifestHeaderSizeImpl(); private: - void addSuffixHashBytes(uint32_t suffix, const uint8_t* hash, + void addSuffixHashBytes(uint32_t suffix, const uint8_t *hash, std::size_t length); - Packet& packet_; + Packet &packet_; std::size_t max_size_; std::unique_ptr manifest_; - ManifestHeader* manifest_header_; - ManifestEntry* manifest_entries_; + ManifestHeader *manifest_header_; + ManifestEntry *manifest_entries_; std::size_t current_entry_; }; class FixedManifestDecoder : public ManifestDecoder { public: - FixedManifestDecoder(Packet& packet); + FixedManifestDecoder(Packet &packet); ~FixedManifestDecoder(); void decodeImpl(); - FixedManifestDecoder& clearImpl(); + FixedManifestDecoder &clearImpl(); ManifestType getManifestTypeImpl() const; @@ -158,9 +158,9 @@ class FixedManifestDecoder : public ManifestDecoder { uint32_t getFinalBlockNumberImpl() const; private: - Packet& packet_; - ManifestHeader* manifest_header_; - ManifestEntry* manifest_entries_; + Packet &packet_; + ManifestHeader *manifest_header_; + ManifestEntry *manifest_entries_; }; } // namespace core -- cgit 1.2.3-korg