瀏覽代碼

clang-format

Tatsuhiro Tsujikawa 9 年之前
父節點
當前提交
a474183bd3
共有 3 個文件被更改,包括 22 次插入27 次删除
  1. 5 7
      src/BitfieldMan.h
  2. 12 14
      src/RandomStreamPieceSelector.cc
  3. 5 6
      src/RandomStreamPieceSelector.h

+ 5 - 7
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,

+ 12 - 14
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;
   }

+ 5 - 6
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_;
 };