2010-06-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made DHTNodeLookupEntry struct
	* src/DHTAbstractNodeLookupTask.cc
	* src/DHTIDCloser.h
	* src/DHTNodeLookupEntry.cc
	* src/DHTNodeLookupEntry.h
	* src/DHTPeerLookupTask.cc
	* test/DHTIDCloserTest.cc

7 files changed, 27 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 98b49bca..62971d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-06-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
+	Made DHTNodeLookupEntry struct
+	* src/DHTAbstractNodeLookupTask.cc
+	* src/DHTIDCloser.h
+	* src/DHTNodeLookupEntry.cc
+	* src/DHTNodeLookupEntry.h
+	* src/DHTPeerLookupTask.cc
+	* test/DHTIDCloserTest.cc
+
+2010-06-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
 	Renamed member variables
 	* src/ActivePeerConnectionCommand.cc
 	* src/BtLeecherStateChoke.cc
diff --git a/src/DHTAbstractNodeLookupTask.cc b/src/DHTAbstractNodeLookupTask.cc
index 5edb1719..dd3bf302 100644
--- a/src/DHTAbstractNodeLookupTask.cc
+++ b/src/DHTAbstractNodeLookupTask.cc
@@ -71,15 +71,15 @@ void DHTAbstractNodeLookupTask::onReceived
   size_t count = 0;
   for(std::vector<SharedHandle<DHTNodeLookupEntry> >::const_iterator i =
         newEntries.begin(), eoi = newEntries.end(); i != eoi; ++i) {
-    if(memcmp(getLocalNode()->getID(), (*i)->_node->getID(),
+    if(memcmp(getLocalNode()->getID(), (*i)->node->getID(),
               DHT_ID_LENGTH) != 0) {
       _entries.push_front(*i);
       ++count;
       if(getLogger()->debug()) {
         getLogger()->debug("Received nodes: id=%s, ip=%s",
-                           util::toHex((*i)->_node->getID(),
+                           util::toHex((*i)->node->getID(),
                                        DHT_ID_LENGTH).c_str(),
-                           (*i)->_node->getIPAddress().c_str());
+                           (*i)->node->getIPAddress().c_str());
       }
     }
   }
@@ -106,7 +106,7 @@ void DHTAbstractNodeLookupTask::onTimeout(const SharedHandle<DHTNode>& node)
   --_inFlightMessage;
   for(std::deque<SharedHandle<DHTNodeLookupEntry> >::iterator i =
         _entries.begin(), eoi = _entries.end(); i != eoi; ++i) {
-    if((*i)->_node == node) {
+    if((*i)->node == node) {
       _entries.erase(i);
       break;
     }
@@ -141,10 +141,10 @@ void DHTAbstractNodeLookupTask::sendMessage()
   for(std::deque<SharedHandle<DHTNodeLookupEntry> >::iterator i =
         _entries.begin(), eoi = _entries.end();
       i != eoi && _inFlightMessage < ALPHA; ++i) {
-    if((*i)->_used == false) {
+    if((*i)->used == false) {
       ++_inFlightMessage;
-      (*i)->_used = true;
-      SharedHandle<DHTMessage> m = createMessage((*i)->_node);
+      (*i)->used = true;
+      SharedHandle<DHTMessage> m = createMessage((*i)->node);
       WeakHandle<DHTMessageCallbackListener> listener(this);
       SharedHandle<DHTMessageCallback> callback
         (new DHTMessageCallbackImpl(listener));
diff --git a/src/DHTIDCloser.h b/src/DHTIDCloser.h
index 420feb45..beccd001 100644
--- a/src/DHTIDCloser.h
+++ b/src/DHTIDCloser.h
@@ -53,7 +53,7 @@ public:
   bool operator()(const SharedHandle<DHTNodeLookupEntry>& m1,
                   const SharedHandle<DHTNodeLookupEntry>& m2) const
   {
-    return _closer(m1->_node->getID(), m2->_node->getID());
+    return _closer(m1->node->getID(), m2->node->getID());
   }
 };
 
diff --git a/src/DHTNodeLookupEntry.cc b/src/DHTNodeLookupEntry.cc
index b0b1a0ca..7596db18 100644
--- a/src/DHTNodeLookupEntry.cc
+++ b/src/DHTNodeLookupEntry.cc
@@ -38,14 +38,14 @@
 namespace aria2 {
 
 DHTNodeLookupEntry::DHTNodeLookupEntry(const SharedHandle<DHTNode>& node):
-  _node(node), _used(false) {}
+  node(node), used(false) {}
 
 DHTNodeLookupEntry::DHTNodeLookupEntry():
-  _node(0), _used(false) {}
+  node(0), used(false) {}
 
 bool DHTNodeLookupEntry::operator==(const DHTNodeLookupEntry& entry) const
 {
-  return _node == entry._node;
+  return node == entry.node;
 }
 
 } // namespace aria2
diff --git a/src/DHTNodeLookupEntry.h b/src/DHTNodeLookupEntry.h
index 6e567d5f..d53e0f0f 100644
--- a/src/DHTNodeLookupEntry.h
+++ b/src/DHTNodeLookupEntry.h
@@ -42,11 +42,10 @@ namespace aria2 {
 
 class DHTNode;
 
-class DHTNodeLookupEntry {
-public:
-  SharedHandle<DHTNode> _node;
+struct DHTNodeLookupEntry {
+  SharedHandle<DHTNode> node;
 
-  bool _used;
+  bool used;
 
   DHTNodeLookupEntry(const SharedHandle<DHTNode>& node);
 
diff --git a/src/DHTPeerLookupTask.cc b/src/DHTPeerLookupTask.cc
index 66408d57..d1ab7b36 100644
--- a/src/DHTPeerLookupTask.cc
+++ b/src/DHTPeerLookupTask.cc
@@ -94,8 +94,8 @@ void DHTPeerLookupTask::onFinish()
   for(std::deque<SharedHandle<DHTNodeLookupEntry> >::const_iterator i =
         getEntries().begin(), eoi = getEntries().end();
       i != eoi && num > 0; ++i, --num) {
-    if((*i)->_used) {
-      const SharedHandle<DHTNode>& node = (*i)->_node;
+    if((*i)->used) {
+      const SharedHandle<DHTNode>& node = (*i)->node;
       SharedHandle<DHTMessage> m = 
         getMessageFactory()->createAnnouncePeerMessage
         (node,
diff --git a/test/DHTIDCloserTest.cc b/test/DHTIDCloserTest.cc
index 09a0e519..032aba6d 100644
--- a/test/DHTIDCloserTest.cc
+++ b/test/DHTIDCloserTest.cc
@@ -56,7 +56,7 @@ void DHTIDCloserTest::testOperator()
   entries.push_back(e4);
   entries.push_back(e5);
 
-  std::sort(entries.begin(), entries.end(), DHTIDCloser(e3->_node->getID()));
+  std::sort(entries.begin(), entries.end(), DHTIDCloser(e3->node->getID()));
 
   CPPUNIT_ASSERT(e3 == entries[0]);
   CPPUNIT_ASSERT(e2 == entries[1]);