commit 398f64b5805246765b699839b439e18c0dfbf2ee
author Elliott Hughes <enh@google.com> Mon Mar 26 18:05:48 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Mar 26 18:05:48 2012 -0700
tree de3f86de82289b1734b12cdc7c4292f4aff16f55
parent ee0fa76b2e5d39ad36d1ff144b2d0270df81e606

Remove more lint, mostly C-style casts.

Change-Id: Iaf1f23290e35ed48e5795fb20690953a9a834457

src/logging.cc

diff --git a/src/logging.cc b/src/logging.cc
index 18fe99b..813fa9a 100644
--- a/src/logging.cc
+++ b/src/logging.cc
@@ -79,7 +79,7 @@
   unsigned int offset;    /* offset to show while printing */
 
   if (show_actual_address) {
-    offset = (int) addr;
+    offset = reinterpret_cast<int>(addr);
   } else {
     offset = 0;
   }
@@ -87,22 +87,21 @@
   out[8] = ':';
   out[sizeof(out)-1] = '\0';
 
-  int gap = (int) offset & 0x0f;
+  int gap = static_cast<int>(offset & 0x0f);
   while (byte_count) {
     unsigned int lineOffset = offset & ~0x0f;
-    int i, count;
 
     char* hex = out;
     char* asc = out + 59;
 
-    for (i = 0; i < 8; i++) {
+    for (int i = 0; i < 8; i++) {
       *hex++ = gHexDigit[lineOffset >> 28];
       lineOffset <<= 4;
     }
     hex++;
     hex++;
 
-    count = ((int)byte_count > 16-gap) ? 16-gap : (int)byte_count; /* cap length */
+    int count = std::min(static_cast<int>(byte_count), 16 - gap);
     CHECK_NE(count, 0);
     CHECK_LE(count + gap, 16);
 
@@ -112,17 +111,19 @@
       asc += gap;
     }
 
+    int i;
     for (i = gap ; i < count+gap; i++) {
       *hex++ = gHexDigit[*addr >> 4];
       *hex++ = gHexDigit[*addr & 0x0f];
       hex++;
-      if (*addr >= 0x20 && *addr < 0x7f /*isprint(*addr)*/)
-      *asc++ = *addr;
-      else
-      *asc++ = '.';
+      if (*addr >= 0x20 && *addr < 0x7f /*isprint(*addr)*/) {
+        *asc++ = *addr;
+      } else {
+        *asc++ = '.';
+      }
       addr++;
     }
-    for ( ; i < 16; i++) {
+    for (; i < 16; i++) {
       /* erase extra stuff; only happens on last line */
       *hex++ = ' ';
       *hex++ = ' ';