commit 748474146da0c6484fa3dca0a700f612d47550c3
author Elliott Hughes <enh@google.com> Wed Jun 20 18:10:21 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Jun 21 09:14:27 2012 -0700
tree 58837d0fa82d4099eb4b82b2fd3d2bbf4294e4aa
parent 92e3134cd84c134f167175288671a1e6838c908f

Fix a bunch of lint.

There are still about 1800 lint warnings, so don't get too excited...

Change-Id: I2394bd6e750b94060231378b3a7a88b87f70c757

src/jdwp/jdwp_adb.cc

diff --git a/src/jdwp/jdwp_adb.cc b/src/jdwp/jdwp_adb.cc
index 096ebc7..4577b59 100644
--- a/src/jdwp/jdwp_adb.cc
+++ b/src/jdwp/jdwp_adb.cc
@@ -48,9 +48,6 @@
 
 #define kInputBufferSize    8192
 
-#define kMagicHandshake     "JDWP-Handshake"
-#define kMagicHandshakeLen  (sizeof(kMagicHandshake)-1)
-
 #define kJdwpControlName    "\0jdwp-control"
 #define kJdwpControlNameLen (sizeof(kJdwpControlName)-1)
 
@@ -64,7 +61,7 @@
   bool                shuttingDown;
   int                 wakeFds[2];
 
-  int                 inputCount;
+  size_t inputCount;
   unsigned char       inputBuffer[kInputBufferSize];
 
   socklen_t           controlAddrLen;
@@ -382,12 +379,12 @@
  */
 static bool haveFullPacket(JdwpNetState* netState) {
   if (netState->awaitingHandshake) {
-    return (netState->inputCount >= (int) kMagicHandshakeLen);
+    return (netState->inputCount >= kMagicHandshakeLen);
   }
   if (netState->inputCount < 4) {
     return false;
   }
-  long length = Get4BE(netState->inputBuffer);
+  uint32_t length = Get4BE(netState->inputBuffer);
   return (netState->inputCount >= length);
 }
 
@@ -397,8 +394,8 @@
  * This would be more efficient with a circular buffer.  However, we're
  * usually only going to find one packet, which is trivial to handle.
  */
-static void consumeBytes(JdwpNetState* netState, int count) {
-  CHECK_GT(count, 0);
+static void consumeBytes(JdwpNetState* netState, size_t count) {
+  CHECK_GT(count, 0U);
   CHECK_LE(count, netState->inputCount);
 
   if (count == netState->inputCount) {
@@ -437,7 +434,7 @@
     cmd = Read1(&buf);
   }
 
-  CHECK_LE((int) length, netState->inputCount);
+  CHECK_LE(length, netState->inputCount);
   dataLen = length - (buf - netState->inputBuffer);
 
   if (!reply) {