commit ba8eee10607a524f43b55a6f33c13924fb16d435
author Elliott Hughes <enh@google.com> Tue Jan 24 20:25:24 2012 -0800
committer Elliott Hughes <enh@google.com> Tue Jan 24 20:25:24 2012 -0800
tree 45f3c3728bcaee9ff04baeaf1706693e677757bf
parent 844f9a072454eb9dca1022299b6bf99ef4294008

Remove more lint.

Change-Id: I48714db4169d9ea0536342809361210910ee2091

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 72a4fdd..f8f5248 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -260,8 +260,8 @@
       return false;
     }
     char* end;
-    long port = strtol(port_string.c_str(), &end, 10);
-    if (*end != '\0') {
+    uint64_t port = strtoul(port_string.c_str(), &end, 10);
+    if (*end != '\0' || port > 0xffff) {
       LOG(ERROR) << "JDWP address has junk in port field: " << value;
       return false;
     }
@@ -500,7 +500,7 @@
   // the primitive types).
   // Returns a newly-allocated buffer full of RefTypeId values.
   struct ClassListCreator {
-    ClassListCreator(std::vector<JDWP::RefTypeId>& classes) : classes(classes) {
+    explicit ClassListCreator(std::vector<JDWP::RefTypeId>& classes) : classes(classes) {
     }
 
     static bool Visit(Class* c, void* arg) {
@@ -1256,7 +1256,7 @@
   ScopedThreadListLock thread_list_lock;
   struct GetFrameVisitor : public Thread::StackVisitor {
     GetFrameVisitor(int desired_frame_number, JDWP::FrameId* pFrameId, JDWP::JdwpLocation* pLoc)
-        : found(false) ,depth(0), desired_frame_number(desired_frame_number), pFrameId(pFrameId), pLoc(pLoc) {
+        : found(false), depth(0), desired_frame_number(desired_frame_number), pFrameId(pFrameId), pLoc(pLoc) {
     }
     virtual void VisitFrame(const Frame& f, uintptr_t pc) {
       // TODO: we'll need to skip callee-save frames too.
@@ -1821,7 +1821,7 @@
   *pReplyBuf = reply;
   *pReplyLen = length + kChunkHdrLen;
 
-  VLOG(jdwp) << StringPrintf("dvmHandleDdm returning type=%.4s buf=%p len=%d", (char*) reply, reply, length);
+  VLOG(jdwp) << StringPrintf("dvmHandleDdm returning type=%.4s buf=%p len=%d", reinterpret_cast<char*>(reply), reply, length);
   return true;
 }
 
@@ -2245,7 +2245,7 @@
 }
 
 struct AllocRecordStackVisitor : public Thread::StackVisitor {
-  AllocRecordStackVisitor(AllocRecord* record) : record(record), depth(0) {
+  explicit AllocRecordStackVisitor(AllocRecord* record) : record(record), depth(0) {
   }
 
   virtual void VisitFrame(const Frame& f, uintptr_t pc) {