mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 13:37:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

clang-format

Browse source
This commit is contained in:
Tatsuhiro Tsujikawa 2016-07-21 01:00:47 +09:00
parent 5b4e3361d4
commit 8e07568a9e
11 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/OptionHandlerFactory.cc
View file

@ -1799,8 +1799,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
handlers.push_back(op); handlers.push_back(op);
} }
{ {
OptionHandler* op(new FloatNumberOptionHandler(PREF_SEED_TIME, TEXT_SEED_TIME, OptionHandler* op(new FloatNumberOptionHandler(
NO_DEFAULT_VALUE, 0)); PREF_SEED_TIME, TEXT_SEED_TIME, NO_DEFAULT_VALUE, 0));
op->addTag(TAG_BITTORRENT); op->addTag(TAG_BITTORRENT);
op->setInitialOption(true); op->setInitialOption(true);
op->setChangeGlobalOption(true); op->setChangeGlobalOption(true);

3
src/RequestGroup.cc
View file

@ -793,8 +793,7 @@ void RequestGroup::tryAutoFileRenaming()
// if slash == idx - 1 this means a form of "*/.*", so the file name // if slash == idx - 1 this means a form of "*/.*", so the file name
// starts with a dot, has no extension otherwise, and therefore do not // starts with a dot, has no extension otherwise, and therefore do not
// extract an extension either // extract an extension either
(slash == std::string::npos || slash < idx - 1) (slash == std::string::npos || slash < idx - 1)) {
) {
ext = fn.substr(idx); ext = fn.substr(idx);
fn = fn.substr(0, idx); fn = fn.substr(0, idx);
} }

3
test/MockPeerStorage.h
View file

@ -39,7 +39,8 @@ public:
} }
virtual std::shared_ptr<Peer> virtual std::shared_ptr<Peer>
addAndCheckoutPeer(const std::shared_ptr<Peer>& peer, cuid_t cuid) CXX11_OVERRIDE addAndCheckoutPeer(const std::shared_ptr<Peer>& peer,
cuid_t cuid) CXX11_OVERRIDE
{ {
unusedPeers.push_back(peer); unusedPeers.push_back(peer);
return nullptr; return nullptr;

17
test/RequestGroupTest.cc
View file

@ -60,7 +60,6 @@ void RequestGroupTest::testTryAutoFileRenaming()
} }
catch (const Exception& ex) { catch (const Exception& ex) {
CPPUNIT_ASSERT_EQUAL(error_code::FILE_ALREADY_EXISTS, ex.getErrorCode()); CPPUNIT_ASSERT_EQUAL(error_code::FILE_ALREADY_EXISTS, ex.getErrorCode());
} }
option_->put(PREF_AUTO_FILE_RENAMING, "true"); option_->put(PREF_AUTO_FILE_RENAMING, "true");
@ -69,15 +68,18 @@ void RequestGroupTest::testTryAutoFileRenaming()
ctx->getFirstFileEntry()->setPath("/tmp/myfile.txt"); ctx->getFirstFileEntry()->setPath("/tmp/myfile.txt");
group.tryAutoFileRenaming(); group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp/myfile.1.txt"), group.getFirstFilePath()); CPPUNIT_ASSERT_EQUAL(std::string("/tmp/myfile.1.txt"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath("/tmp.txt/myfile"); ctx->getFirstFileEntry()->setPath("/tmp.txt/myfile");
group.tryAutoFileRenaming(); group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1"), group.getFirstFilePath()); CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath("/tmp.txt/myfile.txt"); ctx->getFirstFileEntry()->setPath("/tmp.txt/myfile.txt");
group.tryAutoFileRenaming(); group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1.txt"), group.getFirstFilePath()); CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1.txt"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath(".bashrc"); ctx->getFirstFileEntry()->setPath(".bashrc");
group.tryAutoFileRenaming(); group.tryAutoFileRenaming();
@ -89,12 +91,13 @@ void RequestGroupTest::testTryAutoFileRenaming()
ctx->getFirstFileEntry()->setPath("/tmp.txt/.bashrc"); ctx->getFirstFileEntry()->setPath("/tmp.txt/.bashrc");
group.tryAutoFileRenaming(); group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1"), group.getFirstFilePath()); CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath("/tmp.txt/.bashrc.txt"); ctx->getFirstFileEntry()->setPath("/tmp.txt/.bashrc.txt");
group.tryAutoFileRenaming(); group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1.txt"), group.getFirstFilePath()); CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1.txt"),
group.getFirstFilePath());
} }
void RequestGroupTest::testCreateDownloadResult() void RequestGroupTest::testCreateDownloadResult()