diff options
| author | Nils Maier <maierman@web.de> | 2013-08-21 05:06:53 +0200 |
|---|---|---|
| committer | Nils Maier <maierman@web.de> | 2013-08-21 05:56:17 +0200 |
| commit | 8526ceeb452d23d7aa73d01c6cb0fc8ae5e0377b (patch) | |
| tree | 825b4f5d2a0f18331fbbf24773e80ee0b44b50dc /src/HttpResponseCommand.cc | |
| parent | d8f44ef4f6c5ad86b08658ecba41a84b775b6e69 (diff) | |
Convert to autos and ranged loops
Diffstat (limited to 'src/HttpResponseCommand.cc')
| -rw-r--r-- | src/HttpResponseCommand.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc index bf62f014..ffa88aea 100644 --- a/src/HttpResponseCommand.cc +++ b/src/HttpResponseCommand.cc @@ -194,10 +194,9 @@ bool HttpResponseCommand::executeInternal() getDownloadContext()->setAcceptMetalink(false); std::vector<MetalinkHttpEntry> entries; httpResponse->getMetalinKHttpEntries(entries, getOption()); - for(std::vector<MetalinkHttpEntry>::iterator i = entries.begin(), - eoi = entries.end(); i != eoi; ++i) { - getFileEntry()->addUri((*i).uri); - A2_LOG_DEBUG(fmt("Adding URI=%s", (*i).uri.c_str())); + for(const auto& e : entries) { + getFileEntry()->addUri(e.uri); + A2_LOG_DEBUG(fmt("Adding URI=%s", e.uri.c_str())); } } } @@ -205,16 +204,16 @@ bool HttpResponseCommand::executeInternal() if(httpHeader->defined(HttpHeader::DIGEST)) { std::vector<Checksum> checksums; httpResponse->getDigest(checksums); - for(std::vector<Checksum>::iterator i = checksums.begin(), - eoi = checksums.end(); i != eoi; ++i) { + for(const auto &checksum : checksums) { if(getDownloadContext()->getHashType().empty()) { A2_LOG_DEBUG(fmt("Setting digest: type=%s, digest=%s", - (*i).getHashType().c_str(), - (*i).getDigest().c_str())); - getDownloadContext()->setDigest((*i).getHashType(), (*i).getDigest()); + checksum.getHashType().c_str(), + checksum.getDigest().c_str())); + getDownloadContext()->setDigest(checksum.getHashType(), + checksum.getDigest()); break; } else { - if(checkChecksum(getDownloadContext(), *i)) { + if(checkChecksum(getDownloadContext(), checksum)) { break; } } @@ -281,9 +280,8 @@ bool HttpResponseCommand::executeInternal() httpHeader->defined(HttpHeader::DIGEST)) { std::vector<Checksum> checksums; httpResponse->getDigest(checksums); - for(std::vector<Checksum>::iterator i = checksums.begin(), - eoi = checksums.end(); i != eoi; ++i) { - if(checkChecksum(getDownloadContext(), *i)) { + for(const auto &checksum : checksums) { + if(checkChecksum(getDownloadContext(), checksum)) { break; } } |
