From a474183bd36a60b5d81069db2ac9ed64306e0df3 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 15 Apr 2016 22:22:08 +0900 Subject: [PATCH] clang-format --- src/BitfieldMan.h | 12 +++++------- src/RandomStreamPieceSelector.cc | 26 ++++++++++++-------------- src/RandomStreamPieceSelector.h | 11 +++++------ 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/BitfieldMan.h b/src/BitfieldMan.h index de19d325..ffef7b0b 100644 --- a/src/BitfieldMan.h +++ b/src/BitfieldMan.h @@ -166,15 +166,13 @@ public: // to min(|endIndex|, blocks_) // // affected by filter - bool getInorderMissingUnusedIndex - (size_t& index, - size_t startIndex, size_t endIndex, - int32_t minSplitSize, - const unsigned char* ignoreBitfield, - size_t ignoreBitfieldLength) const; + bool getInorderMissingUnusedIndex(size_t& index, size_t startIndex, + size_t endIndex, int32_t minSplitSize, + const unsigned char* ignoreBitfield, + size_t ignoreBitfieldLength) const; // affected by filter - bool getAllMissingIndexes(unsigned char *misbitfield, size_t mislen) const; + bool getAllMissingIndexes(unsigned char* misbitfield, size_t mislen) const; // affected by filter bool getAllMissingIndexes(unsigned char* misbitfield, size_t mislen, diff --git a/src/RandomStreamPieceSelector.cc b/src/RandomStreamPieceSelector.cc index a14c2c2b..e91e256c 100644 --- a/src/RandomStreamPieceSelector.cc +++ b/src/RandomStreamPieceSelector.cc @@ -38,25 +38,23 @@ namespace aria2 { -RandomStreamPieceSelector::RandomStreamPieceSelector -(BitfieldMan* bitfieldMan) - : bitfieldMan_(bitfieldMan) -{} +RandomStreamPieceSelector::RandomStreamPieceSelector(BitfieldMan* bitfieldMan) + : bitfieldMan_(bitfieldMan) +{ +} RandomStreamPieceSelector::~RandomStreamPieceSelector() {} -bool RandomStreamPieceSelector::select -(size_t& index, - size_t minSplitSize, - const unsigned char* ignoreBitfield, - size_t length) +bool RandomStreamPieceSelector::select(size_t& index, size_t minSplitSize, + const unsigned char* ignoreBitfield, + size_t length) { - size_t start = SimpleRandomizer::getInstance()->getRandomNumber - (bitfieldMan_->countBlock()); + size_t start = SimpleRandomizer::getInstance()->getRandomNumber( + bitfieldMan_->countBlock()); - auto rv = bitfieldMan_->getInorderMissingUnusedIndex - (index, start, bitfieldMan_->countBlock(), minSplitSize, ignoreBitfield, - length); + auto rv = bitfieldMan_->getInorderMissingUnusedIndex( + index, start, bitfieldMan_->countBlock(), minSplitSize, ignoreBitfield, + length); if (rv) { return true; } diff --git a/src/RandomStreamPieceSelector.h b/src/RandomStreamPieceSelector.h index 8b624131..f3729c84 100644 --- a/src/RandomStreamPieceSelector.h +++ b/src/RandomStreamPieceSelector.h @@ -41,18 +41,17 @@ namespace aria2 { class BitfieldMan; -class RandomStreamPieceSelector:public StreamPieceSelector { +class RandomStreamPieceSelector : public StreamPieceSelector { public: RandomStreamPieceSelector(BitfieldMan* bitfieldMan); virtual ~RandomStreamPieceSelector(); - virtual bool select - (size_t& index, - size_t minSplitSize, - const unsigned char* ignoreBitfield, - size_t length) CXX11_OVERRIDE; + virtual bool select(size_t& index, size_t minSplitSize, + const unsigned char* ignoreBitfield, + size_t length) CXX11_OVERRIDE; virtual void onBitfieldInit() CXX11_OVERRIDE; + private: BitfieldMan* bitfieldMan_; };