From: Robin H. Johnson <robin.johnson@dreamhost.com>
Date: Wed, 18 May 2016 00:38:38 +0000 (-0700)
Subject: rgw/s3website: whitespace style fixes
X-Git-Tag: v10.2.3~120^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9568%2Fhead;p=ceph.git

rgw/s3website: whitespace style fixes

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit fd35ad001c9430753cc2b1f91a7d48f591c6754e)
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 1f0769693563..826c7a9d78b9 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -698,9 +698,9 @@ void abort_early(struct req_state *s, RGWOp *op, int err_no,
 
   // If the error handler(s) above dealt with it completely, they should have
   // returned 0. If non-zero, we need to continue here.
-  if(err_no) {
+  if (err_no) {
     // Watch out, we might have a custom error state already set!
-    if(s->err.http_ret && s->err.http_ret != 200) {
+    if (s->err.http_ret && s->err.http_ret != 200) {
       dump_errno(s);
     } else {
       set_req_state_err(s, err_no);
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index b70f11ddaf10..845246b26191 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -251,7 +251,7 @@ int RGWGetObj_ObjStore_S3::send_response_data(bufferlist& bl, off_t bl_ofs,
   }
 
 done:
-  if(custom_http_ret) {
+  if (custom_http_ret) {
     set_req_state_err(s, 0);
     dump_errno(s, custom_http_ret);
   } else {
@@ -3997,30 +3997,30 @@ int RGWHandler_REST_S3Website::serve_errordoc(int http_ret, const string& errord
     return -1; // Trigger double error handler
   }
 
-  if(http_ret) {
+  if (http_ret) {
      getop->set_custom_http_response(http_ret);
   }
 
   ret = getop->init_processing();
-  if(ret < 0) {
+  if (ret < 0) {
     ldout(s->cct, 20) << "serve_errordoc failed, init_processing ret=" << ret << dendl;
     return -1; // Trigger double error handler
   }
 
   ret = getop->verify_op_mask();
-  if(ret < 0) {
+  if (ret < 0) {
     ldout(s->cct, 20) << "serve_errordoc failed, verify_op_mask ret=" << ret << dendl;
     return -1; // Trigger double error handler
   }
 
   ret = getop->verify_permission();
-  if(ret < 0) {
+  if (ret < 0) {
     ldout(s->cct, 20) << "serve_errordoc failed, verify_permission ret=" << ret << dendl;
     return -1; // Trigger double error handler
   }
 
   ret = getop->verify_params();
-  if(ret < 0) {
+  if (ret < 0) {
     ldout(s->cct, 20) << "serve_errordoc failed, verify_params ret=" << ret << dendl;
     return -1; // Trigger double error handler
   }
@@ -4079,7 +4079,7 @@ int RGWHandler_REST_S3Website::error_handler(int err_no,
        On failure, we need the double-error handler
      */
     new_err_no = RGWHandler_REST_S3Website::serve_errordoc(http_error_code, s->bucket_info.website_conf.error_doc);
-    if(new_err_no && new_err_no != -1) {
+    if (new_err_no && new_err_no != -1) {
       err_no = new_err_no;
     }
   } else {