commit 2d88862f0752a7a0e65145b088f49dabd49d4284
author Brian Carlstrom <bdc@google.com> Thu Jul 18 17:02:00 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jul 18 17:02:52 2013 -0700
tree 3fac6bbd9a0ff3836f361e46579151c8a93420b6
parent 751d4ed43e8118f145edf18db4d987daf7dabbae

Fixing cpplint readability/casting issues

Change-Id: I6821da0e23737995a9b884a04e9b63fac640cd05

runtime/hprof/hprof.cc

diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc
index d66ec79..3c8099a 100644
--- a/runtime/hprof/hprof.cc
+++ b/runtime/hprof/hprof.cc
@@ -72,7 +72,7 @@
 #define U2_TO_BUF_BE(buf, offset, value) \
     do { \
       unsigned char* buf_ = (unsigned char*)(buf); \
-      int offset_ = (int)(offset); \
+      int offset_ = static_cast<int>(offset); \
       uint16_t value_ = (uint16_t)(value); \
       buf_[offset_ + 0] = (unsigned char)(value_ >>  8); \
       buf_[offset_ + 1] = (unsigned char)(value_      ); \
@@ -81,7 +81,7 @@
 #define U4_TO_BUF_BE(buf, offset, value) \
     do { \
       unsigned char* buf_ = (unsigned char*)(buf); \
-      int offset_ = (int)(offset); \
+      int offset_ = static_cast<int>(offset); \
       uint32_t value_ = (uint32_t)(value); \
       buf_[offset_ + 0] = (unsigned char)(value_ >> 24); \
       buf_[offset_ + 1] = (unsigned char)(value_ >> 16); \
@@ -92,7 +92,7 @@
 #define U8_TO_BUF_BE(buf, offset, value) \
     do { \
       unsigned char* buf_ = (unsigned char*)(buf); \
-      int offset_ = (int)(offset); \
+      int offset_ = static_cast<int>(offset); \
       uint64_t value_ = (uint64_t)(value); \
       buf_[offset_ + 0] = (unsigned char)(value_ >> 56); \
       buf_[offset_ + 1] = (unsigned char)(value_ >> 48); \
@@ -222,7 +222,7 @@
         return UNIQUE_ERROR;
       }
       nb = fwrite(body_, 1, length_, fp_);
-      if (nb != (int)length_) {
+      if (nb != static_cast<int>(length_)) {
         return UNIQUE_ERROR;
       }
 
@@ -984,9 +984,9 @@
         if (size == 1) {
           rec->AddU1List((const uint8_t*)aobj->GetRawData(sizeof(uint8_t)), length);
         } else if (size == 2) {
-          rec->AddU2List((const uint16_t*)(void*)aobj->GetRawData(sizeof(uint16_t)), length);
+          rec->AddU2List((const uint16_t*)aobj->GetRawData(sizeof(uint16_t)), length);
         } else if (size == 4) {
-          rec->AddU4List((const uint32_t*)(void*)aobj->GetRawData(sizeof(uint32_t)), length);
+          rec->AddU4List((const uint32_t*)aobj->GetRawData(sizeof(uint32_t)), length);
         } else if (size == 8) {
           rec->AddU8List((const uint64_t*)aobj->GetRawData(sizeof(uint64_t)), length);
         }