From: Sage Weil <sage@redhat.com>
Date: Mon, 26 Jun 2017 19:47:38 +0000 (-0400)
Subject: rgw/rgw_op: fix indentation warning
X-Git-Tag: v12.1.2~1^2~32^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=075368d89a3fcb1fed2c68d569e190137bdce552;p=ceph.git

rgw/rgw_op: fix indentation warning

/home/sage/src/ceph2/src/rgw/rgw_op.cc: In member function ‘virtual void RGWDeleteObjTags::execute()’:
/home/sage/src/ceph2/src/rgw/rgw_op.cc:777:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
   if (s->object.empty())
   ^~
/home/sage/src/ceph2/src/rgw/rgw_op.cc:780:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
     rgw_obj obj;
     ^~~~~~~

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 80ef87e76c94..8138b6284e75 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -773,18 +773,19 @@ int RGWDeleteObjTags::verify_permission(){
   return 0;
 }
 
-void RGWDeleteObjTags::execute() {
+void RGWDeleteObjTags::execute()
+{
   if (s->object.empty())
     return;
 
-    rgw_obj obj;
-    obj = rgw_obj(s->bucket, s->object);
-    store->set_atomic(s->obj_ctx, obj);
-    map <string, bufferlist> attrs;
-    map <string, bufferlist> rmattr;
-    bufferlist bl;
-    rmattr[RGW_ATTR_TAGS] = bl;
-    op_ret = store->set_attrs(s->obj_ctx, s->bucket_info, obj, attrs, &rmattr);
+  rgw_obj obj;
+  obj = rgw_obj(s->bucket, s->object);
+  store->set_atomic(s->obj_ctx, obj);
+  map <string, bufferlist> attrs;
+  map <string, bufferlist> rmattr;
+  bufferlist bl;
+  rmattr[RGW_ATTR_TAGS] = bl;
+  op_ret = store->set_attrs(s->obj_ctx, s->bucket_info, obj, attrs, &rmattr);
 }
 
 int RGWOp::do_aws4_auth_completion()