Merge pull request #467 from dalgaaf/wip-da-next-SCA-cppcheck-1

Fix typical smaller issues from SCA

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

4 files changed, 7 insertions, 15 deletions

diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h
index 7880d1fda22..50649b6f901 100644
--- a/src/rgw/rgw_metadata.h
+++ b/src/rgw/rgw_metadata.h
@@ -129,9 +129,7 @@ class RGWMetadataLog {
   }
 
 public:
-  RGWMetadataLog(CephContext *_cct, RGWRados *_store) : cct(_cct), store(_store) {
-    prefix = META_LOG_OBJ_PREFIX;
-  }
+  RGWMetadataLog(CephContext *_cct, RGWRados *_store) : cct(_cct), store(_store), prefix(META_LOG_OBJ_PREFIX) {}
 
   int add_entry(RGWRados *store, RGWMetadataHandler *handler, const string& section, const string& key, bufferlist& bl);
 
diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
index 67ba0b12d96..f49a107d2f6 100644
--- a/src/test/test_rgw_admin_log.cc
+++ b/src/test/test_rgw_admin_log.cc
@@ -163,13 +163,13 @@ void test_helper::set_response(char *r){
 }
 
 size_t write_header(void *ptr, size_t size, size_t nmemb, void *ud){
-  test_helper *h = (test_helper *)ud;
+  test_helper *h = static_cast<test_helper *>(ud);
   h->set_response((char *)ptr);
   return size*nmemb;
 }
 
 size_t write_data(void *ptr, size_t size, size_t nmemb, void *ud){
-  test_helper *h = (test_helper *)ud;
+  test_helper *h = static_cast<test_helper *>(ud);
   h->set_response_data((char *)ptr, size*nmemb);
   return size*nmemb;
 }
@@ -405,7 +405,6 @@ int user_create(string& uid, string& display_name, bool set_creds = true) {
 
 int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
   stringstream ss;
-  string creds;
   ss << "-c " << g_test->get_ceph_conf_path() << " user info --uid=" << uid
     << " --display-name=" << display_name;
 
@@ -426,7 +425,6 @@ int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
 
 int user_rm(string& uid, string& display_name) {
   stringstream ss;
-  string creds;
   ss << "-c " << g_test->get_ceph_conf_path() << 
     " metadata rm --metadata-key=user:" << uid;
 
diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc
index 2882891e411..fb9cf863f06 100644
--- a/src/test/test_rgw_admin_meta.cc
+++ b/src/test/test_rgw_admin_meta.cc
@@ -157,13 +157,13 @@ void test_helper::set_response(char *r){
 }
 
 size_t write_header(void *ptr, size_t size, size_t nmemb, void *ud){
-  test_helper *h = (test_helper *)ud;
+  test_helper *h = static_cast<test_helper *>(ud);
   h->set_response((char *)ptr);
   return size*nmemb;
 }
 
 size_t write_data(void *ptr, size_t size, size_t nmemb, void *ud){
-  test_helper *h = (test_helper *)ud;
+  test_helper *h = static_cast<test_helper *>(ud);
   h->set_response_data((char *)ptr, size*nmemb);
   return size*nmemb;
 }
@@ -399,7 +399,6 @@ int user_create(string& uid, string& display_name, bool set_creds = true) {
 
 int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
   stringstream ss;
-  string creds;
   ss << "-c " << g_test->get_ceph_conf_path() << " user info --uid=" << uid
     << " --display-name=" << display_name;
 
@@ -420,7 +419,6 @@ int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
 
 int user_rm(string& uid, string& display_name) {
   stringstream ss;
-  string creds;
   ss << "-c " << g_test->get_ceph_conf_path() << " user rm --uid=" << uid
     << " --display-name=" << display_name;
 
diff --git a/src/test/test_rgw_admin_opstate.cc b/src/test/test_rgw_admin_opstate.cc
index 1cd39890d48..3f173d12932 100644
--- a/src/test/test_rgw_admin_opstate.cc
+++ b/src/test/test_rgw_admin_opstate.cc
@@ -160,13 +160,13 @@ void test_helper::set_response(char *r){
 }
 
 size_t write_header(void *ptr, size_t size, size_t nmemb, void *ud){
-  test_helper *h = (test_helper *)ud;
+  test_helper *h = static_cast<test_helper *>(ud);
   h->set_response((char *)ptr);
   return size*nmemb;
 }
 
 size_t write_data(void *ptr, size_t size, size_t nmemb, void *ud){
-  test_helper *h = (test_helper *)ud;
+  test_helper *h = static_cast<test_helper *>(ud);
   h->set_response_data((char *)ptr, size*nmemb);
   return size*nmemb;
 }
@@ -403,7 +403,6 @@ int user_create(string& uid, string& display_name, bool set_creds = true) {
 
 int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
   stringstream ss;
-  string creds;
   ss << "-c " << g_test->get_ceph_conf_path() << " user info --uid=" << uid
     << " --display-name=" << display_name;
 
@@ -424,7 +423,6 @@ int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
 
 int user_rm(string& uid, string& display_name) {
   stringstream ss;
-  string creds;
   ss << "-c " << g_test->get_ceph_conf_path() << 
     " metadata rm --metadata-key=user:" << uid;