aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2020-04-09 02:14:04 +0200
committerJay Berkenbilt <ejb@ql.org>2020-04-09 02:45:26 +0200
commit1a7d3700a665a5ae29c8bab67ddc7fee7040b731 (patch)
tree625e79f255f5c57ea438816cb7714628ca0c66a2 /libqpdf
parentb89b1d772db935ed36b8abe8a21ee6468ada3d23 (diff)
downloadqpdf-1a7d3700a665a5ae29c8bab67ddc7fee7040b731.tar.zst
Fix unnecessary copies in auto iter (fixes #426)
Also switch to colon-style iteration in some cases. Thanks to Dean Scarff for drawing this to my attention after detecting some unnecessary copies with https://clang.llvm.org/extra/clang-tidy/checks/performance-for-range-copy.html
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/JSON.cc2
-rw-r--r--libqpdf/QPDFCryptoProvider.cc5
-rw-r--r--libqpdf/QPDF_Array.cc5
-rw-r--r--libqpdf/SparseOHArray.cc27
4 files changed, 17 insertions, 22 deletions
diff --git a/libqpdf/JSON.cc b/libqpdf/JSON.cc
index 247d3c86..f75935aa 100644
--- a/libqpdf/JSON.cc
+++ b/libqpdf/JSON.cc
@@ -346,7 +346,7 @@ JSON::checkSchemaInternal(JSON_value* this_v, JSON_value* sch_v,
if (sch_dict && (! pattern_key.empty()))
{
auto pattern_schema = sch_dict->members[pattern_key].getPointer();
- for (auto iter: this_dict->members)
+ for (auto const& iter: this_dict->members)
{
std::string const& key = iter.first;
checkSchemaInternal(
diff --git a/libqpdf/QPDFCryptoProvider.cc b/libqpdf/QPDFCryptoProvider.cc
index b375498d..5f65da3b 100644
--- a/libqpdf/QPDFCryptoProvider.cc
+++ b/libqpdf/QPDFCryptoProvider.cc
@@ -110,10 +110,9 @@ QPDFCryptoProvider::getRegisteredImpls()
{
std::set<std::string> result;
QPDFCryptoProvider& p = getInstance();
- for (auto iter = p.m->providers.begin(); iter != p.m->providers.end();
- ++iter)
+ for (auto const& iter: p.m->providers)
{
- result.insert((*iter).first);
+ result.insert(iter.first);
}
return result;
}
diff --git a/libqpdf/QPDF_Array.cc b/libqpdf/QPDF_Array.cc
index 609e9d77..d2091fab 100644
--- a/libqpdf/QPDF_Array.cc
+++ b/libqpdf/QPDF_Array.cc
@@ -146,9 +146,8 @@ QPDF_Array::getElementsForShallowCopy() const
void
QPDF_Array::addExplicitElementsToList(std::list<QPDFObjectHandle>& l) const
{
- for (auto iter = this->elements.begin();
- iter != this->elements.end(); ++iter)
+ for (auto const& iter: this->elements)
{
- l.push_back((*iter).second);
+ l.push_back(iter.second);
}
}
diff --git a/libqpdf/SparseOHArray.cc b/libqpdf/SparseOHArray.cc
index 48ddce0f..c8aaefa8 100644
--- a/libqpdf/SparseOHArray.cc
+++ b/libqpdf/SparseOHArray.cc
@@ -30,7 +30,7 @@ SparseOHArray::at(size_t idx) const
throw std::logic_error(
"INTERNAL ERROR: bounds error accessing SparseOHArray element");
}
- auto iter = this->elements.find(idx);
+ auto const& iter = this->elements.find(idx);
if (iter == this->elements.end())
{
return QPDFObjectHandle::newNull();
@@ -57,10 +57,9 @@ SparseOHArray::remove_last()
void
SparseOHArray::releaseResolved()
{
- for (auto iter = this->elements.begin();
- iter != this->elements.end(); ++iter)
+ for (auto iter: this->elements)
{
- QPDFObjectHandle::ReleaseResolver::releaseResolved((*iter).second);
+ QPDFObjectHandle::ReleaseResolver::releaseResolved(iter.second);
}
}
@@ -89,16 +88,15 @@ SparseOHArray::erase(size_t idx)
throw std::logic_error("bounds error erasing item from SparseOHArray");
}
decltype(this->elements) dest;
- for (auto iter = this->elements.begin();
- iter != this->elements.end(); ++iter)
+ for (auto const& iter: this->elements)
{
- if ((*iter).first < idx)
+ if (iter.first < idx)
{
- dest.insert(*iter);
+ dest.insert(iter);
}
- else if ((*iter).first > idx)
+ else if (iter.first > idx)
{
- dest[(*iter).first - 1] = (*iter).second;
+ dest[iter.first - 1] = iter.second;
}
}
this->elements = dest;
@@ -120,16 +118,15 @@ SparseOHArray::insert(size_t idx, QPDFObjectHandle oh)
else
{
decltype(this->elements) dest;
- for (auto iter = this->elements.begin();
- iter != this->elements.end(); ++iter)
+ for (auto const& iter: this->elements)
{
- if ((*iter).first < idx)
+ if (iter.first < idx)
{
- dest.insert(*iter);
+ dest.insert(iter);
}
else
{
- dest[(*iter).first + 1] = (*iter).second;
+ dest[iter.first + 1] = iter.second;
}
}
this->elements = dest;