Merge pull request #451 from dalgaaf/wip-da-SCA-cppcheck-6-v2

Fix some issues from SCA - v2 - against ceph:next

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_bucket.cc
Simple merge

diff --cc src/rgw/rgw_op.cc
index 17a3aaa8439d536d4e9ef0e097b889ef9b17e200,1c1824937f5925a2ed5391e24509dafb19f6b324..45477486ccc00c9cae2ddc2b942b5f11d5977b50
--- 1/src/rgw/rgw_op.cc
--- 2/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@@ -178,9 -178,9 +178,8 @@@ static int decode_policy(CephContext *c
  
  static int get_bucket_policy_from_attr(CephContext *cct, RGWRados *store, void *ctx,
                                         RGWBucketInfo& bucket_info, map<string, bufferlist>& bucket_attrs,
 -                                       RGWAccessControlPolicy *policy, rgw_obj& obj,
 -                                       RGWObjVersionTracker *objv_tracker)
 +                                       RGWAccessControlPolicy *policy, rgw_obj& obj)
  {
-   int ret;
    map<string, bufferlist>::iterator aiter = bucket_attrs.find(RGW_ATTR_ACL);
  
    if (aiter != bucket_attrs.end()) {

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge