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>

7 files changed, 24 insertions, 24 deletions

diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index 291ca705d7b..165ca437987 100644
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -187,8 +187,8 @@ int cls_rgw_bi_log_list(IoCtx& io_ctx, string& oid, string& marker, uint32_t max
 
 int cls_rgw_bi_log_trim(IoCtx& io_ctx, string& oid, string& start_marker, string& end_marker)
 {
-  int r;
   do {
+    int r;
     bufferlist in, out;
     cls_rgw_bi_log_trim_op call;
     call.start_marker = start_marker;
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index e5d880f7d24..67f5f1c68b3 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -236,32 +236,31 @@ enum {
 static int get_cmd(const char *cmd, const char *prev_cmd, bool *need_more)
 {
   *need_more = false;
-  if (strcmp(cmd, "bucket") == 0 ||
+  // NOTE: please keep the checks in alphabetical order !!!
+  if (strcmp(cmd, "bilog") == 0 ||
+      strcmp(cmd, "bucket") == 0 ||
       strcmp(cmd, "buckets") == 0 ||
-      strcmp(cmd, "user") == 0 ||
       strcmp(cmd, "caps") == 0 ||
+      strcmp(cmd, "datalog") == 0 ||
       strcmp(cmd, "gc") == 0 || 
       strcmp(cmd, "key") == 0 ||
       strcmp(cmd, "log") == 0 ||
+      strcmp(cmd, "mdlog") == 0 ||
+      strcmp(cmd, "metadata") == 0 ||
       strcmp(cmd, "object") == 0 ||
+      strcmp(cmd, "opstate") == 0 ||
       strcmp(cmd, "pool") == 0 ||
       strcmp(cmd, "pools") == 0 ||
-      strcmp(cmd, "subuser") == 0 ||
-      strcmp(cmd, "temp") == 0 ||
-      strcmp(cmd, "usage") == 0 ||
-      strcmp(cmd, "user") == 0 ||
       strcmp(cmd, "region") == 0 ||
       strcmp(cmd, "regions") == 0 ||
       strcmp(cmd, "region-map") == 0 ||
       strcmp(cmd, "regionmap") == 0 ||
-      strcmp(cmd, "zone") == 0 ||
+      strcmp(cmd, "replicalog") == 0 ||
+      strcmp(cmd, "subuser") == 0 ||
       strcmp(cmd, "temp") == 0 ||
-      strcmp(cmd, "metadata") == 0 ||
-      strcmp(cmd, "mdlog") == 0 ||
-      strcmp(cmd, "bilog") == 0 ||
-      strcmp(cmd, "datalog") == 0 ||
-      strcmp(cmd, "opstate") == 0 ||
-      strcmp(cmd, "replicalog") == 0) {
+      strcmp(cmd, "usage") == 0 ||
+      strcmp(cmd, "user") == 0 ||
+      strcmp(cmd, "zone") == 0) {
     *need_more = true;
     return 0;
   }
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 7b22f44790b..400ee8dd2a4 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -115,7 +115,7 @@ int rgw_link_bucket(RGWRados *store, string user_id, rgw_bucket& bucket, time_t
   }
 
   if (!update_entrypoint)
-    return false;
+    return 0;
 
   ep.linked = true;
   ep.owner = user_id;
@@ -149,7 +149,7 @@ int rgw_unlink_bucket(RGWRados *store, string user_id, const string& bucket_name
   }
 
   if (!update_entrypoint)
-    return false;
+    return 0;
 
   RGWBucketEntryPoint ep;
   RGWObjVersionTracker ot;
@@ -416,7 +416,6 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg)
   std::string display_name = op_state.get_user_display_name();
   rgw_bucket bucket = op_state.get_bucket();
 
-  string uid_str(user_info.user_id);
   rgw_obj obj(bucket, no_oid);
   RGWObjVersionTracker objv_tracker;
 
@@ -1419,7 +1418,7 @@ public:
       ret = rgw_unlink_bucket(store, be.owner, be.bucket.name, false);
     }
 
-    return 0;
+    return ret;
   }
 
   struct list_keys_info {
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 17a3aaa8439..45477486ccc 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -180,11 +180,10 @@ static int get_bucket_policy_from_attr(CephContext *cct, RGWRados *store, void *
                                        RGWBucketInfo& bucket_info, map<string, bufferlist>& bucket_attrs,
                                        RGWAccessControlPolicy *policy, rgw_obj& obj)
 {
-  int ret;
   map<string, bufferlist>::iterator aiter = bucket_attrs.find(RGW_ATTR_ACL);
 
   if (aiter != bucket_attrs.end()) {
-    ret = decode_policy(cct, aiter->second, policy);
+    int ret = decode_policy(cct, aiter->second, policy);
     if (ret < 0)
       return ret;
   } else {
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 087fdcf8e09..31400dc8402 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -5664,7 +5664,7 @@ int RGWStateLog::list_entries(void *handle, int max_entries,
                               list<cls_statelog_entry>& entries,
                               bool *done)
 {
-  list_state *state = (list_state *)handle;
+  list_state *state = static_cast<list_state *>(handle);
 
   librados::IoCtx ioctx;
   int r = open_ioctx(ioctx);
@@ -5712,7 +5712,7 @@ int RGWStateLog::list_entries(void *handle, int max_entries,
 
 void RGWStateLog::finish_list_entries(void *handle)
 {
-  list_state *state = (list_state *)handle;
+  list_state *state = static_cast<list_state *>(handle);
   delete state;
 }
 
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 623bb0b5e16..0f9e61d1740 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -835,8 +835,10 @@ int rgw_rest_read_all_input(struct req_state *s, char **pdata, int *plen, int ma
        return -ENOMEM;
     }
     int ret = s->cio->read(data, cl, &len);
-    if (ret < 0)
+    if (ret < 0) {
+      free(data);
       return ret;
+    }
     data[len] = '\0';
   } else if (!s->length) {
     const char *encoding = s->info.env->get("HTTP_TRANSFER_ENCODING");
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 9e8ec3f88a5..66f6652ec6a 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -409,12 +409,13 @@ int RGWCreateBucket_ObjStore_S3::get_params()
 
     bool success = parser.parse(data, len, 1);
     ldout(s->cct, 20) << "create bucket input data=" << data << dendl;
-    free(data);
 
     if (!success) {
       ldout(s->cct, 0) << "failed to parse input: " << data << dendl;
+      free(data);
       return -EINVAL;
     }
+    free(data);
 
     if (!parser.get_location_constraint(location_constraint)) {
       ldout(s->cct, 0) << "provided input did not specify location constraint correctly" << dendl;