From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 14 Oct 2014 14:57:57 +0000 (+0200)
Subject: crush/CrushWrapper.cc: use reinterpret_cast instead of c-style cast
X-Git-Tag: v0.88~29^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89eb2fe2ea21248b3080a75587b699d0dfa946dc;p=ceph.git

crush/CrushWrapper.cc: use reinterpret_cast instead of c-style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 8ea936167fc6..715313651c65 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1005,26 +1005,26 @@ void CrushWrapper::encode(bufferlist& bl, bool lean) const
 
     switch (crush->buckets[i]->alg) {
     case CRUSH_BUCKET_UNIFORM:
-      ::encode(((crush_bucket_uniform*)crush->buckets[i])->item_weight, bl);
+      ::encode((reinterpret_cast<crush_bucket_uniform*>(crush->buckets[i]))->item_weight, bl);
       break;
 
     case CRUSH_BUCKET_LIST:
       for (unsigned j=0; j<crush->buckets[i]->size; j++) {
-	::encode(((crush_bucket_list*)crush->buckets[i])->item_weights[j], bl);
-	::encode(((crush_bucket_list*)crush->buckets[i])->sum_weights[j], bl);
+	::encode((reinterpret_cast<crush_bucket_list*>(crush->buckets[i]))->item_weights[j], bl);
+	::encode((reinterpret_cast<crush_bucket_list*>(crush->buckets[i]))->sum_weights[j], bl);
       }
       break;
 
     case CRUSH_BUCKET_TREE:
-      ::encode(((crush_bucket_tree*)crush->buckets[i])->num_nodes, bl);
-      for (unsigned j=0; j<((crush_bucket_tree*)crush->buckets[i])->num_nodes; j++)
-	::encode(((crush_bucket_tree*)crush->buckets[i])->node_weights[j], bl);
+      ::encode((reinterpret_cast<crush_bucket_tree*>(crush->buckets[i]))->num_nodes, bl);
+      for (unsigned j=0; j<(reinterpret_cast<crush_bucket_tree*>(crush->buckets[i]))->num_nodes; j++)
+	::encode((reinterpret_cast<crush_bucket_tree*>(crush->buckets[i]))->node_weights[j], bl);
       break;
 
     case CRUSH_BUCKET_STRAW:
       for (unsigned j=0; j<crush->buckets[i]->size; j++) {
-	::encode(((crush_bucket_straw*)crush->buckets[i])->item_weights[j], bl);
-	::encode(((crush_bucket_straw*)crush->buckets[i])->straws[j], bl);
+	::encode((reinterpret_cast<crush_bucket_straw*>(crush->buckets[i]))->item_weights[j], bl);
+	::encode((reinterpret_cast<crush_bucket_straw*>(crush->buckets[i]))->straws[j], bl);
       }
       break;
 
@@ -1114,7 +1114,7 @@ void CrushWrapper::decode(bufferlist::iterator& blp)
 
       __u32 len;
       ::decode(len, blp);
-      crush->rules[i] = (crush_rule*)calloc(1, crush_rule_size(len));
+      crush->rules[i] = reinterpret_cast<crush_rule*>(calloc(1, crush_rule_size(len)));
       crush->rules[i]->len = len;
       ::decode(crush->rules[i]->mask, blp);
       for (unsigned j=0; j<crush->rules[i]->len; j++)
@@ -1179,7 +1179,7 @@ void CrushWrapper::decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator
       throw buffer::malformed_input(str);
     }
   }
-  crush_bucket *bucket = (crush_bucket*)calloc(1, size);
+  crush_bucket *bucket = reinterpret_cast<crush_bucket*>(calloc(1, size));
   *bptr = bucket;
     
   ::decode(bucket->id, blp);
@@ -1199,11 +1199,11 @@ void CrushWrapper::decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator
 
   switch (bucket->alg) {
   case CRUSH_BUCKET_UNIFORM:
-    ::decode(((crush_bucket_uniform*)bucket)->item_weight, blp);
+    ::decode((reinterpret_cast<crush_bucket_uniform*>(bucket))->item_weight, blp);
     break;
 
   case CRUSH_BUCKET_LIST: {
-    crush_bucket_list* cbl = (crush_bucket_list*)bucket;
+    crush_bucket_list* cbl = reinterpret_cast<crush_bucket_list*>(bucket);
     cbl->item_weights = (__u32*)calloc(1, bucket->size * sizeof(__u32));
     cbl->sum_weights = (__u32*)calloc(1, bucket->size * sizeof(__u32));
 
@@ -1215,7 +1215,7 @@ void CrushWrapper::decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator
   }
 
   case CRUSH_BUCKET_TREE: {
-    crush_bucket_tree* cbt = (crush_bucket_tree*)bucket;
+    crush_bucket_tree* cbt = reinterpret_cast<crush_bucket_tree*>(bucket);
     ::decode(cbt->num_nodes, blp);
     cbt->node_weights = (__u32*)calloc(1, cbt->num_nodes * sizeof(__u32));
     for (unsigned j=0; j<cbt->num_nodes; j++) {
@@ -1225,7 +1225,7 @@ void CrushWrapper::decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator
   }
 
   case CRUSH_BUCKET_STRAW: {
-    crush_bucket_straw* cbs = (crush_bucket_straw*)bucket;
+    crush_bucket_straw* cbs = reinterpret_cast<crush_bucket_straw*>(bucket);
     cbs->straws = (__u32*)calloc(1, bucket->size * sizeof(__u32));
     cbs->item_weights = (__u32*)calloc(1, bucket->size * sizeof(__u32));
     for (unsigned j = 0; j < bucket->size; ++j) {