Merge pull request #81 from dalgaaf/wip-da-sca-style-1

Fix some smaller style issues

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

18 files changed, 29 insertions, 49 deletions

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index 45c9d43cec3..d7ef8c89ecf 100644
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -292,7 +292,7 @@ SyntheticClient::SyntheticClient(Client *client, int w)
 
 void *synthetic_client_thread_entry(void *ptr)
 {
-  SyntheticClient *sc = (SyntheticClient*)ptr;
+  SyntheticClient *sc = static_cast<SyntheticClient*>(ptr);
   //int r = 
   sc->run();
   return 0;//(void*)r;
diff --git a/src/client/hypertable/CephBroker.h b/src/client/hypertable/CephBroker.h
index 48d7cbdb345..6924103221c 100644
--- a/src/client/hypertable/CephBroker.h
+++ b/src/client/hypertable/CephBroker.h
@@ -58,7 +58,7 @@ namespace Hypertable {
   public:
     OpenFileDataCephPtr() : OpenFileDataPtr() { }
     OpenFileDataCephPtr(OpenFileDataCeph *ofdl) : OpenFileDataPtr(ofdl, true) { }
-    OpenFileDataCeph *operator->() const { return (OpenFileDataCeph *)get(); }
+    OpenFileDataCeph *operator->() const { return static_cast<OpenFileDataCeph *>(get()); }
   };
 
   /**
diff --git a/src/cls_acl.cc b/src/cls_acl.cc
index d3c774d5b93..db0cdac2e23 100644
--- a/src/cls_acl.cc
+++ b/src/cls_acl.cc
@@ -23,9 +23,7 @@ cls_method_handle_t h_set;
 int get_method(cls_method_context_t ctx, char *indata, int datalen,
 				 char **outdata, int *outdatalen)
 {
-   int i;
    MD5_CTX c;
-   unsigned char *md;
 
    cls_log("acl test method");
    cls_log("indata=%.*s data_len=%d", datalen, indata, datalen);
@@ -38,9 +36,7 @@ int get_method(cls_method_context_t ctx, char *indata, int datalen,
 int set_method(cls_method_context_t ctx, char *indata, int datalen,
 				 char **outdata, int *outdatalen)
 {
-   int i;
    MD5_CTX c;
-   unsigned char *md;
 
    cls_log("acl test method");
    cls_log("indata=%.*s data_len=%d", datalen, indata, datalen);
diff --git a/src/cls_crypto.cc b/src/cls_crypto.cc
index 3f01dd078ba..db940041017 100644
--- a/src/cls_crypto.cc
+++ b/src/cls_crypto.cc
@@ -1,6 +1,3 @@
-
-
-
 #include <iostream>
 #include <string.h>
 #include <stdlib.h>
@@ -24,7 +21,6 @@ cls_method_handle_t h_sha1;
 int md5_method(cls_method_context_t ctx, char *indata, int datalen,
 				 char **outdata, int *outdatalen)
 {
-   int i;
    MD5_CTX c;
    unsigned char *md;
 
@@ -48,7 +44,6 @@ int md5_method(cls_method_context_t ctx, char *indata, int datalen,
 int sha1_method(cls_method_context_t ctx, char *indata, int datalen,
 				 char **outdata, int *outdatalen)
 {
-   int i;
    SHA_CTX c;
    unsigned char *md;
 
diff --git a/src/common/TextTable.cc b/src/common/TextTable.cc
index cacb59ce8b3..4aef2f94ea7 100644
--- a/src/common/TextTable.cc
+++ b/src/common/TextTable.cc
@@ -15,7 +15,7 @@
 
 using namespace std;
 
-void TextTable::define_column(const string heading,
+void TextTable::define_column(const string &heading,
 			      enum TextTable::Align hd_align,
 			      enum TextTable::Align col_align)
 {
diff --git a/src/common/TextTable.h b/src/common/TextTable.h
index 44d0aa4cd46..9f8e8ea9384 100644
--- a/src/common/TextTable.h
+++ b/src/common/TextTable.h
@@ -68,7 +68,7 @@ public:
    * TextTable::LEFT, TextTable::CENTER, or TextTable::RIGHT
    *
    */
-  void define_column(const std::string heading, Align hd_align,
+  void define_column(const std::string& heading, Align hd_align,
 		     Align col_align);
 
   /**
diff --git a/src/common/armor.c b/src/common/armor.c
index e4b8b86928e..0fd2c918c27 100644
--- a/src/common/armor.c
+++ b/src/common/armor.c
@@ -57,14 +57,16 @@ int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
 } while (0);
 
 	while (src < end) {
-		unsigned char a, b, c;
+		unsigned char a;
 
 		a = *src++;
 		SET_DST(encode_bits(a >> 2));
 		if (src < end) {
+			unsigned char b;
 			b = *src++;
 			SET_DST(encode_bits(((a & 3) << 4) | (b >> 4)));
 			if (src < end) {
+				unsigned char c;
 				c = *src++;
 				SET_DST(encode_bits(((b & 15) << 2) |
 								(c >> 6)));
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 0be1c8cea34..a1181a00810 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -187,7 +187,6 @@ void CephContext::do_command(std::string command, std::string args, bufferlist *
       } else {
 	std::string val = var.substr(pos+1);
 	var.resize(pos);
-	std::vector<const char*> args;
 	int r = _conf->set_val(var.c_str(), val.c_str());
 	if (r < 0) {
 	  jf.dump_stream("error") << "error setting '" << var << "' to '" << val << "': " << cpp_strerror(r);
diff --git a/src/common/code_environment.cc b/src/common/code_environment.cc
index 58b27f86049..2cf19f48bc5 100644
--- a/src/common/code_environment.cc
+++ b/src/common/code_environment.cc
@@ -47,7 +47,6 @@ std::ostream &operator<<(std::ostream &oss, enum code_environment_t e)
 
 int get_process_name(char *buf, int len)
 {
-  int ret;
   if (len <= 16) {
     /* The man page discourages using this prctl with a buffer shorter
      * than 16 bytes. With a 16-byte buffer, it might not be
@@ -59,6 +58,7 @@ int get_process_name(char *buf, int len)
     return -ENAMETOOLONG;
 #else
   memset(buf, 0, len);
+  int ret;
   ret = prctl(PR_GET_NAME, buf);
   return ret;
 #endif
diff --git a/src/common/config.cc b/src/common/config.cc
index 87b74eda668..319b9d5782d 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -505,7 +505,6 @@ int md_config_t::parse_injectargs(std::vector<const char*>& args,
 				  std::ostream *oss)
 {
   assert(lock.is_locked());
-  std::string val;
   int ret = 0;
   for (std::vector<const char*>::iterator i = args.begin(); i != args.end(); ) {
     int r = parse_option(args, i, oss);
diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index 54ed0db3f92..07a954e3d38 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -84,7 +84,7 @@ ostream& ObjBencher::out(ostream& os)
 }
 
 void *ObjBencher::status_printer(void *_bencher) {
-  ObjBencher *bencher = (ObjBencher *)_bencher;
+  ObjBencher *bencher = static_cast<ObjBencher *>(_bencher);
   bench_data& data = bencher->data;
   Cond cond;
   int i = 0;
diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc
index 38a5751c042..8a68a4f0b00 100644
--- a/src/common/pick_address.cc
+++ b/src/common/pick_address.cc
@@ -26,7 +26,7 @@
 
 static const struct sockaddr *find_ip_in_subnet_list(CephContext *cct,
 						     const struct ifaddrs *ifa,
-						     const std::string networks)
+						     const std::string &networks)
 {
   std::list<string> nets;
   get_str_list(networks, nets);
diff --git a/src/common/secret.c b/src/common/secret.c
index f37619a72da..82150930eab 100644
--- a/src/common/secret.c
+++ b/src/common/secret.c
@@ -57,7 +57,6 @@ int set_kernel_secret(const char *secret, const char *key_name)
   int ret;
   int secret_len = strlen(secret);
   char payload[((secret_len * 3) / 4) + 4];
-  char error_buf[80];
 
   if (!secret_len) {
     fprintf(stderr, "secret is empty.\n");
@@ -66,6 +65,7 @@ int set_kernel_secret(const char *secret, const char *key_name)
 
   ret = ceph_unarmor(payload, payload+sizeof(payload), secret, secret+secret_len);
   if (ret < 0) {
+    char error_buf[80];
     fprintf(stderr, "secret is not valid base64: %s.\n",
 	    strerror_r(-ret, error_buf, sizeof(error_buf)));
     return ret;
@@ -99,7 +99,6 @@ int get_secret_option(const char *secret, const char *key_name,
     olen += strlen(secret);
   }
   char option[olen+1];
-  char error_buf[80];
   int use_key = 1;
 
   option[olen] = '\0';
@@ -114,6 +113,7 @@ int get_secret_option(const char *secret, const char *key_name,
 	ret = 0;
 	use_key = 0;
       } else {
+        char error_buf[80];
 	fprintf(stderr, "adding ceph secret key to kernel failed: %s.\n",
 		strerror_r(-ret, error_buf, sizeof(error_buf)));
 	return ret;
diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
index 5a9eb441b2c..c54a7b916e4 100644
--- a/src/crush/CrushCompiler.cc
+++ b/src/crush/CrushCompiler.cc
@@ -100,12 +100,9 @@ int CrushCompiler::decompile_bucket_impl(int i, ostream &out)
     print_item_name(out, item, crush);
     out << " weight ";
     print_fixedpoint(out, w);
-    if (dopos) {
-      if (alg == CRUSH_BUCKET_TREE)
-	out << " pos " << j;
-      else
-	out << " pos " << j;
-    }
+    if (dopos) 
+      out << " pos " << j;
+    
     out << "\n";
   }
   out << "}\n";
diff --git a/src/crush/builder.c b/src/crush/builder.c
index 880c8090243..5b5f58a4708 100644
--- a/src/crush/builder.c
+++ b/src/crush/builder.c
@@ -55,7 +55,6 @@ void crush_finalize(struct crush_map *map)
 int crush_add_rule(struct crush_map *map, struct crush_rule *rule, int ruleno)
 {
 	__u32 r;
-	int oldsize;
 
 	if (ruleno < 0) {
 		for (r=0; r < map->max_rules; r++)
@@ -68,6 +67,7 @@ int crush_add_rule(struct crush_map *map, struct crush_rule *rule, int ruleno)
 
 	if (r >= map->max_rules) {
 		/* expand array */
+		int oldsize;
 		oldsize = map->max_rules;
 		map->max_rules = r+1;
 		map->rules = realloc(map->rules, map->max_rules * sizeof(map->rules[0]));
diff --git a/src/include/bloom_filter.hpp b/src/include/bloom_filter.hpp
index 66f620c8df9..41aba4bad47 100644
--- a/src/include/bloom_filter.hpp
+++ b/src/include/bloom_filter.hpp
@@ -72,17 +72,19 @@ public:
 
    bloom_filter& operator = (const bloom_filter& filter)
    {
-      salt_count_ = filter.salt_count_;
-      table_size_ = filter.table_size_;
-      raw_table_size_ = filter.raw_table_size_;
-      predicted_inserted_element_count_ = filter.predicted_inserted_element_count_;
-      inserted_element_count_ = filter.inserted_element_count_;
-      random_seed_ = filter.random_seed_;
-      desired_false_positive_probability_ = filter.desired_false_positive_probability_;
-      delete[] bit_table_;
-      bit_table_ = new cell_type[raw_table_size_];
-      std::copy(filter.bit_table_,filter.bit_table_ + raw_table_size_,bit_table_);
-      salt_ = filter.salt_;
+      if (this != &filter) {
+        salt_count_ = filter.salt_count_;
+        table_size_ = filter.table_size_;
+        raw_table_size_ = filter.raw_table_size_;
+        predicted_inserted_element_count_ = filter.predicted_inserted_element_count_;
+        inserted_element_count_ = filter.inserted_element_count_;
+        random_seed_ = filter.random_seed_;
+        desired_false_positive_probability_ = filter.desired_false_positive_probability_;
+        delete[] bit_table_;
+        bit_table_ = new cell_type[raw_table_size_];
+        std::copy(filter.bit_table_,filter.bit_table_ + raw_table_size_,bit_table_);
+        salt_ = filter.salt_;
+      }
       return *this;
    }
 
diff --git a/src/key_value_store/cls_kvs.cc b/src/key_value_store/cls_kvs.cc
index 8c70a63f54b..21c6ee6d96b 100644
--- a/src/key_value_store/cls_kvs.cc
+++ b/src/key_value_store/cls_kvs.cc
@@ -43,7 +43,6 @@ static int get_idata_from_key(cls_method_context_t hctx, const string &key,
   bufferlist raw_val;
   int r = 0;
   std::map<std::string, bufferlist> kvmap;
-  std::map<std::string, bufferlist> dupmap;
 
   r = cls_cxx_map_get_vals(hctx, key_data(key).encoded(), "", 2, &kvmap);
   if (r < 0) {
diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc
index ac274379037..2f0017749f1 100644
--- a/src/key_value_store/kv_flat_btree_async.cc
+++ b/src/key_value_store/kv_flat_btree_async.cc
@@ -49,7 +49,6 @@ void IndexCache::push(const string &key, const index_data &idata) {
   if (cache_size == 0) {
     return;
   }
-  stringstream rs;
   index_data old_idata;
   map<key_data, pair<index_data, utime_t> >::iterator old_it =
       k2itmap.lower_bound(key_data(key));
@@ -76,7 +75,6 @@ void IndexCache::push(const index_data &idata) {
   if (cache_size == 0) {
     return;
   }
-  stringstream rs;
   if (k2itmap.count(idata.kdata) > 0) {
     utime_t old_time = k2itmap[idata.kdata].second;
     t2kmap.erase(old_time);
@@ -1380,7 +1378,6 @@ int KvFlatBtreeAsync::set(const string &key, const bufferlist &val,
       << (update_on_existing? "updating " : "setting ")
       << key << std::endl;
   int err = 0;
-  string obj;
   utime_t mytime;
   index_data idata(key);
 
@@ -1430,7 +1427,6 @@ int KvFlatBtreeAsync::set_op(const string &key, const bufferlist &val,
       cerr << "\t" << client_name << ": writing key failed with "
   	<< err << std::endl;
       return err;
-      break;
     }
     case -EKEYREJECTED: {
       //the object needs to be split.
@@ -1498,7 +1494,6 @@ int KvFlatBtreeAsync::remove(const string &key) {
   if (verbose) cout << client_name << ": removing " << key << std::endl;
   int err = 0;
   string obj;
-  string hk;
   utime_t mytime;
   index_data idata;
   index_data next_idata;
@@ -1547,7 +1542,6 @@ int KvFlatBtreeAsync::remove_op(const string &key, index_data &idata,
     case -ENODATA: {
       //the key does not exist in the object
       return err;
-      break;
     }
     case -EKEYREJECTED: {
       //the object needs to be split.
@@ -1606,7 +1600,6 @@ int KvFlatBtreeAsync::remove_op(const string &key, index_data &idata,
 	return err;
       }
       return remove(key);
-      break;
     }
     default:
       if (err == -ENOENT || err == -EACCES) {
@@ -1665,8 +1658,6 @@ int KvFlatBtreeAsync::get(const string &key, bufferlist *val) {
   if (verbose) cout << client_name << ": getting " << key << std::endl;
   int err = 0;
   index_data idata;
-  string obj;
-  string hk;
   utime_t mytime;
 
   if ((((KeyValueStructure *)this)->*KvFlatBtreeAsync::interrupt)() == 1 ) {