Merge branch 'master' into random-webseeding

1 files changed, 15 insertions, 13 deletions

diff --git a/src/UTMetadataRequestTracker.cc b/src/UTMetadataRequestTracker.cc
index cbb20806..213c198f 100644
--- a/src/UTMetadataRequestTracker.cc
+++ b/src/UTMetadataRequestTracker.cc
@@ -59,7 +59,7 @@ void UTMetadataRequestTracker::remove(size_t index)
 {
   auto i = std::find(trackedRequests_.begin(), trackedRequests_.end(),
                      RequestEntry(index));
-  if(i != trackedRequests_.end()) {
+  if (i != trackedRequests_.end()) {
     trackedRequests_.erase(i);
   }
 }
@@ -74,14 +74,15 @@ std::vector<size_t> UTMetadataRequestTracker::removeTimeoutEntry()
   trackedRequests_.erase(
       std::remove_if(std::begin(trackedRequests_), std::end(trackedRequests_),
                      [&indexes](const RequestEntry& ent) {
-        if (ent.elapsed(TIMEOUT)) {
-          A2_LOG_DEBUG(fmt("ut_metadata request timeout. index=%lu",
-                           static_cast<unsigned long>(ent.index_)));
-          indexes.push_back(ent.index_);
-          return true;
-        }
-        return false;
-      }),
+                       if (ent.elapsed(TIMEOUT)) {
+                         A2_LOG_DEBUG(
+                             fmt("ut_metadata request timeout. index=%lu",
+                                 static_cast<unsigned long>(ent.index_)));
+                         indexes.push_back(ent.index_);
+                         return true;
+                       }
+                       return false;
+                     }),
       std::end(trackedRequests_));
   return indexes;
 }
@@ -89,9 +90,10 @@ std::vector<size_t> UTMetadataRequestTracker::removeTimeoutEntry()
 size_t UTMetadataRequestTracker::avail() const
 {
   const size_t MAX_OUTSTANDING_REQUEST = 1;
-  if(MAX_OUTSTANDING_REQUEST > count()) {
-    return MAX_OUTSTANDING_REQUEST-count();
-  } else {
+  if (MAX_OUTSTANDING_REQUEST > count()) {
+    return MAX_OUTSTANDING_REQUEST - count();
+  }
+  else {
     return 0;
   }
 }
@@ -99,7 +101,7 @@ size_t UTMetadataRequestTracker::avail() const
 std::vector<size_t> UTMetadataRequestTracker::getAllTrackedIndex() const
 {
   std::vector<size_t> indexes;
-  for(auto& e: trackedRequests_) {
+  for (auto& e : trackedRequests_) {
     indexes.push_back(e.index_);
   }
   return indexes;