diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-20 09:36:14 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-20 09:36:14 +0000 |
| commit | 694fb307aa7e582a55bce7e995bde3a4614b3b4f (patch) | |
| tree | 42bf3e703ebd706c9ebdd62bca59396f2d67a790 /src/HttpResponse.cc | |
| parent | 580098eb4929a3bdbf424af18da361259ef2efe5 (diff) | |
2010-11-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Replaced StringFormat with fmt
Diffstat (limited to 'src/HttpResponse.cc')
| -rw-r--r-- | src/HttpResponse.cc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/HttpResponse.cc b/src/HttpResponse.cc index 963b84bd..14ede864 100644 --- a/src/HttpResponse.cc +++ b/src/HttpResponse.cc @@ -44,7 +44,6 @@ #include "message.h" #include "DlAbortEx.h" #include "DlRetryEx.h" -#include "StringFormat.h" #include "fmt.h" #include "A2STR.h" #include "CookieStorage.h" @@ -78,8 +77,7 @@ void HttpResponse::validateResponse() const statusCode == 303 || statusCode == 307) { if(!httpHeader_->defined(HttpHeader::LOCATION)) { - throw DL_ABORT_EX - (StringFormat(EX_LOCATION_HEADER_REQUIRED, statusCode).str()); + throw DL_ABORT_EX(fmt(EX_LOCATION_HEADER_REQUIRED, statusCode)); } return; } else if(statusCode == 200 || statusCode == 206) { @@ -88,20 +86,18 @@ void HttpResponse::validateResponse() const RangeHandle responseRange = httpHeader_->getRange(); if(!httpRequest_->isRangeSatisfied(responseRange)) { throw DL_ABORT_EX2 - (StringFormat - (EX_INVALID_RANGE_HEADER, - util::itos(httpRequest_->getStartByte(), true).c_str(), - util::itos(httpRequest_->getEndByte(), true).c_str(), - util::uitos(httpRequest_->getEntityLength(), true).c_str(), - util::itos(responseRange->getStartByte(), true).c_str(), - util::itos(responseRange->getEndByte(), true).c_str(), - util::uitos(responseRange->getEntityLength(), true).c_str()).str(), + (fmt(EX_INVALID_RANGE_HEADER, + util::itos(httpRequest_->getStartByte(), true).c_str(), + util::itos(httpRequest_->getEndByte(), true).c_str(), + util::uitos(httpRequest_->getEntityLength(), true).c_str(), + util::itos(responseRange->getStartByte(), true).c_str(), + util::itos(responseRange->getEndByte(), true).c_str(), + util::uitos(responseRange->getEntityLength(), true).c_str()), downloadresultcode::CANNOT_RESUME); } } } else { - throw DL_ABORT_EX - (StringFormat("Unexpected status %d", statusCode).str()); + throw DL_ABORT_EX(fmt("Unexpected status %d", statusCode)); } } @@ -155,9 +151,9 @@ void HttpResponse::processRedirect() httpRequest_->getRequest()->getCurrentUri().c_str())); } else { throw DL_RETRY_EX - (StringFormat("CUID#%s - Redirect to %s failed. It may not be a valid" - " URI.", util::itos(cuid_).c_str(), - httpRequest_->getRequest()->getCurrentUri().c_str()).str()); + (fmt("CUID#%s - Redirect to %s failed. It may not be a valid URI.", + util::itos(cuid_).c_str(), + httpRequest_->getRequest()->getCurrentUri().c_str())); } } |