Rename status variable for funky compiler.

Author: mrambacher

cloud/cloud_log_controller.cc

@@ -54,14 +54,14 @@ Status CloudLogControllerImpl::Initialize(CloudEnv* env) {
   cache_dir_ = bucket_dir + pathsep + uid;
 
   // Create temporary directories.
-  Status status = env_->GetBaseEnv()->CreateDirIfMissing(kCacheDir);
-  if (status.ok()) {
-    status = env_->GetBaseEnv()->CreateDirIfMissing(bucket_dir);
+  Status st = env_->GetBaseEnv()->CreateDirIfMissing(kCacheDir);
+  if (st.ok()) {
+    st = env_->GetBaseEnv()->CreateDirIfMissing(bucket_dir);
   }
-  if (status.ok()) {
-    status = env_->GetBaseEnv()->CreateDirIfMissing(cache_dir_);
+  if (st.ok()) {
+    st = env_->GetBaseEnv()->CreateDirIfMissing(cache_dir_);
   }
-  return status;
+  return st;
 }
 
 Status CloudLogControllerImpl::Prepare(CloudEnv* env) {

cloud/cloud_storage_provider.cc

@@ -256,7 +256,7 @@ Status CloudStorageWritableFileImpl::Sync() {
 CloudStorageProvider::~CloudStorageProvider() {}
 
 Status CloudStorageProvider::Prepare(CloudEnv* env) {
-  Status status;
+  Status st;
   if (env->HasDestBucket()) {
     // create dest bucket if specified
     if (ExistsBucket(env->GetDestBucketName()).ok()) {
@@ -267,19 +267,19 @@ Status CloudStorageProvider::Prepare(CloudEnv* env) {
       Log(InfoLogLevel::INFO_LEVEL, env->info_log_,
           "[%s] Going to create bucket %s", Name(),
           env->GetDestBucketName().c_str());
-      status = CreateBucket(env->GetDestBucketName());
+      st = CreateBucket(env->GetDestBucketName());
     } else {
-      status = Status::NotFound(
+      st = Status::NotFound(
           "Bucket not found and create_bucket_if_missing is false");
     }
-    if (!status.ok()) {
+    if (!st.ok()) {
       Log(InfoLogLevel::ERROR_LEVEL, env->info_log_,
           "[%s] Unable to create bucket %s %s", Name(),
-          env->GetDestBucketName().c_str(), status.ToString().c_str());
-      return status;
+          env->GetDestBucketName().c_str(), st.ToString().c_str());
+      return st;
     }
   }
-  return status;
+  return st;
 }
 
 CloudStorageProviderImpl::CloudStorageProviderImpl() : rng_(time(nullptr)) {}