refactor

repertory/librepertory/include/comm/curl/curl_comm.hpp

@@ -49,6 +49,7 @@ private:
 
   static const write_callback write_data;
   static const write_callback write_headers;
+  static constexpr std::uint8_t retry_request_count{5U};
 
 private:
   std::optional<host_config> host_config_;
@@ -239,7 +240,8 @@ public:
     };
 
     bool ret{false};
-    for (std::uint8_t retry = 0U; !ret && retry < 5U; ++retry) {
+    for (std::uint8_t retry = 0U; !ret && retry < retry_request_count;
+         ++retry) {
       ret = do_request();
       if (ret) {
         break;

repertory/librepertory/src/comm/curl/multi_request.cpp

@@ -44,21 +44,22 @@ void multi_request::get_result(CURLcode &curl_code, long &http_code) {
   curl_code = CURLcode::CURLE_ABORTED_BY_CALLBACK;
   http_code = -1;
 
-  auto error = false;
-  int running_handles = 0;
+  auto error{false};
+  int running_handles{0};
   curl_multi_perform(multi_handle_, &running_handles);
   while (not error && (running_handles > 0) && not get_stop_requested()) {
     int ignored{};
     curl_multi_wait(multi_handle_, nullptr, 0, timeout_ms, &ignored);
 
-    const auto ret = curl_multi_perform(multi_handle_, &running_handles);
+    auto ret = curl_multi_perform(multi_handle_, &running_handles);
     error = (ret != CURLM_CALL_MULTI_PERFORM) && (ret != CURLM_OK);
   }
 
   if (not get_stop_requested()) {
-    int remaining_messages = 0;
-    auto *multi_result =
-        curl_multi_info_read(multi_handle_, &remaining_messages);
+    int remaining_messages{0};
+    auto *multi_result{
+        curl_multi_info_read(multi_handle_, &remaining_messages),
+    };
     if ((multi_result != nullptr) && (multi_result->msg == CURLMSG_DONE)) {
       curl_easy_getinfo(multi_result->easy_handle, CURLINFO_RESPONSE_CODE,
                         &http_code);