From e22a91290d2f90df97ba2bf401c302e45c4f7997 Mon Sep 17 00:00:00 2001
From: Luo Kexue <luo.kexue@zte.com.cn>
Date: Mon, 31 Jul 2017 19:40:12 +0800
Subject: [PATCH] rgw: remove some unused variable

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
---
 src/common/options.cc            | 1 -
 src/rgw/rgw_admin.cc             | 1 -
 src/rgw/rgw_bucket.cc            | 1 -
 src/rgw/rgw_common.h             | 1 -
 src/rgw/rgw_es_main.cc           | 2 --
 src/rgw/rgw_rados.cc             | 5 -----
 src/test/cls_rbd/test_cls_rbd.cc | 2 --
 7 files changed, 13 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index f97d619ed923e..fffe177eb538d 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -88,7 +88,6 @@ void Option::dump(Formatter *f) const
   f->dump_string("name", name);
 
   f->dump_string("type", type_to_str(type));
-  std::string level_str;
 
   f->dump_string("level", level_to_str(level));
 
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 1be1d1594ed36..06ab1ae9c844a 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2154,7 +2154,6 @@ static void sync_status(Formatter *formatter)
 
   for (auto iter : store->zone_conn_map) {
     const string& source_id = iter.first;
-    string zone_name;
     string source_str = "source: ";
     string s = source_str + source_id;
     auto siter = store->zone_by_id.find(source_id);
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 1f2896ea4c10d..2c934506fa8e4 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1309,7 +1309,6 @@ int RGWBucketAdminOp::check_index(RGWRados *store, RGWBucketAdminOpState& op_sta
                   RGWFormatterFlusher& flusher)
 {
   int ret;
-  map<string, rgw_bucket_dir_entry> result;
   map<RGWObjCategory, RGWStorageStats> existing_stats;
   map<RGWObjCategory, RGWStorageStats> calculated_stats;
   list<rgw_obj_index_key> objs_to_unlink;
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 2ec385f1cb254..4a3d85dd98bb5 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1628,7 +1628,6 @@ struct rgw_obj_key {
    * part of the given namespace, it returns false.
    */
   static bool oid_to_key_in_ns(const string& oid, rgw_obj_key *key, const string& ns) {
-    string obj_ns;
     bool ret = parse_raw_oid(oid, key);
     if (!ret) {
       return ret;
diff --git a/src/rgw/rgw_es_main.cc b/src/rgw/rgw_es_main.cc
index 78b2865ed3327..43145835b5831 100644
--- a/src/rgw/rgw_es_main.cc
+++ b/src/rgw/rgw_es_main.cc
@@ -22,8 +22,6 @@ int main(int argc, char *argv[])
 
   common_init_finish(g_ceph_context);
 
-  list<string> infix;
-
   string expr;
 
   if (argc > 1) {
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 6cdfdd6026e5d..67823e5c20268 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -8122,7 +8122,6 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx,
     if (tail_placement.bucket.name.empty()) {
       manifest.set_tail_placement(tail_placement.placement_rule, src_obj.bucket);
     }
-    string oid, key;
     for (; miter != astate->manifest.obj_end(); ++miter) {
       ObjectWriteOperation op;
       cls_refcount_get(op, tag, true);
@@ -8176,8 +8175,6 @@ done_ret:
   if (!copy_itself) {
     vector<rgw_raw_obj>::iterator riter;
 
-    string oid, key;
-
     /* rollback reference */
     for (riter = ref_objs.begin(); riter != ref_objs.end(); ++riter) {
       ObjectWriteOperation op;
@@ -10084,7 +10081,6 @@ int RGWRados::Object::Read::read(int64_t ofs, int64_t end, bufferlist& bl)
   RGWRados *store = source->get_store();
   CephContext *cct = store->ctx();
 
-  std::string oid, key;
   rgw_raw_obj read_obj;
   uint64_t read_ofs = ofs;
   uint64_t len, read_len;
@@ -11580,7 +11576,6 @@ int RGWRados::get_bucket_stats(RGWBucketInfo& bucket_info, int shard_id, string
   BucketIndexShardsManager ver_mgr;
   BucketIndexShardsManager master_ver_mgr;
   BucketIndexShardsManager marker_mgr;
-  string shard_marker;
   char buf[64];
   for(; iter != headers.end(); ++iter, ++viter) {
     accumulate_raw_stats(iter->second, stats);
diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index fb274391471ae..50c59cf058b19 100644
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -1013,7 +1013,6 @@ TEST_F(TestClsRbd, snapshots_namespaces)
 
   ASSERT_EQ(0, create_image(&ioctx, oid, 10, 22, 0, oid, -1));
 
-  vector<string> snap_names;
   vector<cls::rbd::SnapshotNamespace> snap_namespaces;
   SnapContext snapc;
 
@@ -1051,7 +1050,6 @@ TEST_F(TestClsRbd, snapshots_timestamps)
 
   ASSERT_EQ(0, create_image(&ioctx, oid, 10, 22, 0, oid, -1));
 
-  vector<string> snap_names;
   vector<utime_t> snap_timestamps;
   SnapContext snapc;
 
-- 
2.39.5