github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed threshold of using upper unit for abbrevSize

pull/43/head
Tatsuhiro Tsujikawa 2012-12-19 23:58:24 +09:00
parent 07bb779eb0
commit b017e80438
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util.cc
View File

@ -1302,7 +1302,7 @@ std::string abbrevSize(int64_t size)
r = d.rem; r = d.rem;
++uidx; ++uidx;
} }
if(uidx+1 < sizeof(UNITS)/sizeof(UNITS[0]) && t >= 512) { if(uidx+1 < sizeof(UNITS)/sizeof(UNITS[0]) && t >= 922) {
++uidx; ++uidx;
r = t; r = t;
t = 0; t = 0;

3
test/UtilTest.cc
View File

@ -1555,7 +1555,6 @@ void UtilTest::testAbbrevSize()
CPPUNIT_ASSERT_EQUAL(std::string("4.0Gi"), util::abbrevSize(4294967296LL)); CPPUNIT_ASSERT_EQUAL(std::string("4.0Gi"), util::abbrevSize(4294967296LL));
CPPUNIT_ASSERT_EQUAL(std::string("1.0Ki"), util::abbrevSize(1024)); CPPUNIT_ASSERT_EQUAL(std::string("1.0Ki"), util::abbrevSize(1024));
CPPUNIT_ASSERT_EQUAL(std::string("0.9Ki"), util::abbrevSize(1023)); CPPUNIT_ASSERT_EQUAL(std::string("0.9Ki"), util::abbrevSize(1023));
CPPUNIT_ASSERT_EQUAL(std::string("0.5Ki"), util::abbrevSize(512));
CPPUNIT_ASSERT_EQUAL(std::string("511"), util::abbrevSize(511)); CPPUNIT_ASSERT_EQUAL(std::string("511"), util::abbrevSize(511));
CPPUNIT_ASSERT_EQUAL(std::string("0"), util::abbrevSize(0)); CPPUNIT_ASSERT_EQUAL(std::string("0"), util::abbrevSize(0));
CPPUNIT_ASSERT_EQUAL(std::string("1.1Ki"), util::abbrevSize(1127)); CPPUNIT_ASSERT_EQUAL(std::string("1.1Ki"), util::abbrevSize(1127));
@ -1582,7 +1581,7 @@ void UtilTest::testToStream()
" |12KiB (12,300)\n" " |12KiB (12,300)\n"
"---+---------------------------------------------------------------------------\n" "---+---------------------------------------------------------------------------\n"
" 2|aria2.txt\n" " 2|aria2.txt\n"
" |0.5KiB (556)\n" " |556B (556)\n"
"---+---------------------------------------------------------------------------\n"), "---+---------------------------------------------------------------------------\n"),
readFile(filename)); readFile(filename));
} }