summaryrefslogtreecommitdiff
path: root/src/Piece.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-06-21 18:04:30 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-06-21 19:29:54 +0900
commit318c804504e32b7a0bbdbb35336d2e918000d80a (patch)
treefad396aee04c44a29ee79b33e1675db2275146c0 /src/Piece.cc
parent8ba9b0474747185708a25943fb6d2f97b3d9b17f (diff)
Use user-defined literal for k, m, and g (powers of 1024)
Diffstat (limited to 'src/Piece.cc')
-rw-r--r--src/Piece.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Piece.cc b/src/Piece.cc
index e5c3c9c7..54453657 100644
--- a/src/Piece.cc
+++ b/src/Piece.cc
@@ -245,23 +245,22 @@ void updateHashWithRead(MessageDigest* mdctx,
const std::shared_ptr<DiskAdaptor>& adaptor,
int64_t offset, size_t len)
{
- const size_t BUFSIZE = 4096;
- unsigned char buf[BUFSIZE];
- ldiv_t res = ldiv(len, BUFSIZE);
+ std::array<unsigned char, 4_k> buf;
+ ldiv_t res = ldiv(len, buf.size());
for(int j = 0; j < res.quot; ++j) {
- ssize_t nread = adaptor->readData(buf, BUFSIZE, offset);
- if((size_t)nread != BUFSIZE) {
+ ssize_t nread = adaptor->readData(buf.data(), buf.size(), offset);
+ if((size_t)nread != buf.size()) {
throw DL_ABORT_EX(fmt(EX_FILE_READ, "n/a", "data is too short"));
}
- mdctx->update(buf, nread);
+ mdctx->update(buf.data(), nread);
offset += nread;
}
if(res.rem) {
- ssize_t nread = adaptor->readData(buf, res.rem, offset);
+ ssize_t nread = adaptor->readData(buf.data(), res.rem, offset);
if(nread != res.rem) {
throw DL_ABORT_EX(fmt(EX_FILE_READ, "n/a", "data is too short"));
}
- mdctx->update(buf, nread);
+ mdctx->update(buf.data(), nread);
}
}
} // namespace