diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-06-25 23:35:24 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-06-25 23:35:24 +0900 |
| commit | 1b874268a067b4aba0e329768b82df635d7cae17 (patch) | |
| tree | f72263f15286a6c3372d87571c261789ff8c87f7 /src/HttpRequestCommand.cc | |
| parent | 4b03634f36b05c32737aeea8ca178f53f68052e8 (diff) | |
Use int64_t instead of off_t
Some classes such as DiskAdaptor, DiskWriter, FileAllocationIterator
and ChecksumValidator are left unchanged.
Diffstat (limited to 'src/HttpRequestCommand.cc')
| -rw-r--r-- | src/HttpRequestCommand.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc index a52ce99e..3d0ba593 100644 --- a/src/HttpRequestCommand.cc +++ b/src/HttpRequestCommand.cc @@ -86,13 +86,13 @@ SharedHandle<HttpRequest> createHttpRequest(const SharedHandle<Request>& req, const SharedHandle<FileEntry>& fileEntry, const SharedHandle<Segment>& segment, - off_t totalLength, + int64_t totalLength, const SharedHandle<Option>& option, const RequestGroup* rg, const SharedHandle<CookieStorage>& cookieStorage, const SharedHandle<AuthConfigFactory>& authConfigFactory, const SharedHandle<Request>& proxyRequest, - off_t endOffset = 0) + int64_t endOffset = 0) { SharedHandle<HttpRequest> httpRequest(new HttpRequest()); httpRequest->setUserAgent(option->get(PREF_USER_AGENT)); @@ -180,15 +180,14 @@ bool HttpRequestCommand::executeInternal() { itr != eoi; ++itr) { const SharedHandle<Segment>& segment = *itr; if(!httpConnection_->isIssued(segment)) { - off_t endOffset = 0; - if(getRequestGroup()->getTotalLength() > 0 && - getPieceStorage()) { + int64_t endOffset = 0; + if(getRequestGroup()->getTotalLength() > 0 && getPieceStorage()) { size_t nextIndex = getPieceStorage()->getNextUsedIndex(segment->getIndex()); endOffset = std::min - (static_cast<off_t>(getFileEntry()->getLength()), + (getFileEntry()->getLength(), getFileEntry()->gtoloff - (static_cast<off_t>(segment->getSegmentLength())*nextIndex)); + (static_cast<int64_t>(segment->getSegmentLength())*nextIndex)); } SharedHandle<HttpRequest> httpRequest (createHttpRequest(getRequest(), |