Address review comments

googleapis · Jul 3, 2024 · 002484a · 002484a
1 parent 5e5f7e6
commit 002484a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/google/cloud/storage/internal/retry_object_read_source.cc b/google/cloud/storage/internal/retry_object_read_source.cc
@@ -37,13 +37,13 @@ std::uint64_t InitialOffset(OffsetDirection const& offset_direction,
 
 RetryObjectReadSource::RetryObjectReadSource(
     ReadSourceFactory factory,
-    google::cloud::internal::ImmutableOptions current,
+    google::cloud::internal::ImmutableOptions options,
     ReadObjectRangeRequest request, std::unique_ptr<ObjectReadSource> child,
     std::unique_ptr<RetryPolicy> retry_policy,
     std::unique_ptr<BackoffPolicy> backoff_policy,
     std::function<void(std::chrono::milliseconds)> backoff)
     : factory_(std::move(factory)),
-      current_(std::move(current)),
+      options_(std::move(options)),
       request_(std::move(request)),
       child_(std::move(child)),
       retry_policy_prototype_(std::move(retry_policy)),
@@ -55,12 +55,12 @@ RetryObjectReadSource::RetryObjectReadSource(
 
 RetryObjectReadSource::RetryObjectReadSource(
     ReadSourceFactory factory,
-    google::cloud::internal::ImmutableOptions current,
+    google::cloud::internal::ImmutableOptions options,
     ReadObjectRangeRequest request, std::unique_ptr<ObjectReadSource> child,
     std::unique_ptr<RetryPolicy> retry_policy,
     std::unique_ptr<BackoffPolicy> backoff_policy)
     : RetryObjectReadSource(
-          std::move(factory), std::move(current), std::move(request),
+          std::move(factory), std::move(options), std::move(request),
           std::move(child), std::move(retry_policy), std::move(backoff_policy),
           [](std::chrono::milliseconds d) { std::this_thread::sleep_for(d); }) {
 }
@@ -148,7 +148,7 @@ Status RetryObjectReadSource::MakeChild(RetryPolicy& retry_policy,
     return Status{};
   };
 
-  OptionsSpan const span(current_);
+  OptionsSpan const span(options_);
   auto child = factory_(request_, retry_policy, backoff_policy);
   if (!child) return std::move(child).status();
   if (!is_gunzipped_) return on_success(*std::move(child));

diff --git a/google/cloud/storage/internal/retry_object_read_source.h b/google/cloud/storage/internal/retry_object_read_source.h
@@ -48,14 +48,14 @@ class RetryObjectReadSource : public ObjectReadSource {
           ReadObjectRangeRequest const&, RetryPolicy&, BackoffPolicy&)>;
 
   RetryObjectReadSource(ReadSourceFactory factory,
-                        google::cloud::internal::ImmutableOptions current,
+                        google::cloud::internal::ImmutableOptions options,
                         ReadObjectRangeRequest request,
                         std::unique_ptr<ObjectReadSource> child,
                         std::unique_ptr<RetryPolicy> retry_policy,
                         std::unique_ptr<BackoffPolicy> backoff_policy,
                         std::function<void(std::chrono::milliseconds)> backoff);
   RetryObjectReadSource(ReadSourceFactory factory,
-                        google::cloud::internal::ImmutableOptions current,
+                        google::cloud::internal::ImmutableOptions options,
                         ReadObjectRangeRequest request,
                         std::unique_ptr<ObjectReadSource> child,
                         std::unique_ptr<RetryPolicy> retry_policy,
@@ -72,7 +72,7 @@ class RetryObjectReadSource : public ObjectReadSource {
       std::unique_ptr<ObjectReadSource> child, std::int64_t count) const;
 
   ReadSourceFactory factory_;
-  google::cloud::internal::ImmutableOptions current_;
+  google::cloud::internal::ImmutableOptions options_;
   ReadObjectRangeRequest request_;
   std::unique_ptr<ObjectReadSource> child_;
   absl::optional<std::int64_t> generation_;