2008-03-07 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Use unsigned char for data store.

30 files changed, 149 insertions, 125 deletions

diff --git a/test/AnnounceListTest.cc b/test/AnnounceListTest.cc
index 4576c818..dc3df779 100644
--- a/test/AnnounceListTest.cc
+++ b/test/AnnounceListTest.cc
@@ -43,7 +43,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( AnnounceListTest );
 
 void AnnounceListTest::testSingleElementList() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
@@ -89,7 +89,7 @@ void AnnounceListTest::testSingleElementList() {
 
 void AnnounceListTest::testMultiElementList() {
   std::string peersString = "ll8:tracker18:tracker28:tracker3ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
   // ANNOUNCE_LIST
   // [ [ tracker1, tracker2, tracker3 ] ]
   AnnounceList announceList(announces);
@@ -121,7 +121,7 @@ void AnnounceListTest::testMultiElementList() {
 
 void AnnounceListTest::testSingleAndMulti() {
   std::string peersString = "ll8:tracker18:tracker2el8:tracker3ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1, tracker2 ], [ tracker3 ] ]
@@ -147,7 +147,7 @@ void AnnounceListTest::testSingleAndMulti() {
 
 void AnnounceListTest::testNoGroup() {
   std::string peersString = "llee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   AnnounceList announceList(announces);
 
@@ -156,7 +156,7 @@ void AnnounceListTest::testNoGroup() {
 
 void AnnounceListTest::testNextEventIfAfterStarted() {
   std::string peersString = "ll8:tracker1ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ] ]
@@ -176,7 +176,7 @@ void AnnounceListTest::testNextEventIfAfterStarted() {
 
 void AnnounceListTest::testEvent() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
@@ -200,7 +200,7 @@ void AnnounceListTest::testEvent() {
 
 void AnnounceListTest::testCountStoppedAllowedTier() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
@@ -227,7 +227,7 @@ void AnnounceListTest::testCountStoppedAllowedTier() {
 
 void AnnounceListTest::testCountCompletedAllowedTier() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
diff --git a/test/BtExtendedMessageTest.cc b/test/BtExtendedMessageTest.cc
index 5375152e..7e5de256 100644
--- a/test/BtExtendedMessageTest.cc
+++ b/test/BtExtendedMessageTest.cc
@@ -66,7 +66,7 @@ void BtExtendedMessageTest::testCreate() {
 
   // payload:{4:name3:foo}->11bytes
   std::string payload = "4:name3:foo";
-  char msg[17];// 6+11bytes
+  unsigned char msg[17];// 6+11bytes
   PeerMessageUtil::createPeerMessageString((unsigned char*)msg, sizeof(msg), 13, 20);
   msg[5] = 1; // Set dummy extended message ID 1
   memcpy(msg+6, payload.c_str(), payload.size());
@@ -77,8 +77,8 @@ void BtExtendedMessageTest::testCreate() {
   
   // case: payload size is wrong
   try {
-    char msg[5];
-    PeerMessageUtil::createPeerMessageString((unsigned char*)msg, sizeof(msg), 1, 20);
+    unsigned char msg[5];
+    PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 20);
     BtExtendedMessage::create(ctx, peer, &msg[4], 1);
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
@@ -87,8 +87,8 @@ void BtExtendedMessageTest::testCreate() {
   }
   // case: id is wrong
   try {
-    char msg[6];
-    PeerMessageUtil::createPeerMessageString((unsigned char*)msg, sizeof(msg), 2, 21);
+    unsigned char msg[6];
+    PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 2, 21);
     BtExtendedMessage::create(ctx, peer, &msg[4], 2);
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
@@ -101,13 +101,11 @@ void BtExtendedMessageTest::testGetMessage() {
   std::string payload = "4:name3:foo";
   uint8_t extendedMessageID = 1;
   SharedHandle<MockExtensionMessage> exmsg =
-    new MockExtensionMessage("charlie", extendedMessageID,
-			     payload.c_str(),
-			     payload.size());
+    new MockExtensionMessage("charlie", extendedMessageID, payload);
   BtExtendedMessage msg(exmsg);
 
-  char data[17];
-  PeerMessageUtil::createPeerMessageString((unsigned char*)data, sizeof(data), 13, 20);
+  unsigned char data[17];
+  PeerMessageUtil::createPeerMessageString(data, sizeof(data), 13, 20);
   *(data+5) = extendedMessageID;
   memcpy(data+6, payload.c_str(), payload.size());
   CPPUNIT_ASSERT(memcmp(msg.getMessage(), data, 17) == 0);
@@ -115,7 +113,7 @@ void BtExtendedMessageTest::testGetMessage() {
 
 void BtExtendedMessageTest::testDoReceivedAction() {
   SharedHandle<MockExtensionMessage> exmsg =
-    new MockExtensionMessage("charlie", 1, "", 0);
+    new MockExtensionMessage("charlie", 1, "");
   BtExtendedMessage msg(exmsg);
   msg.doReceivedAction();
   CPPUNIT_ASSERT(exmsg->_doReceivedActionCalled);
@@ -125,9 +123,7 @@ void BtExtendedMessageTest::testToString() {
   std::string payload = "4:name3:foo";
   uint8_t extendedMessageID = 1;
   SharedHandle<MockExtensionMessage> exmsg =
-    new MockExtensionMessage("charlie", extendedMessageID,
-			     payload.c_str(),
-			     payload.size());
+    new MockExtensionMessage("charlie", extendedMessageID, payload);
   BtExtendedMessage msg(exmsg);
   CPPUNIT_ASSERT_EQUAL(std::string("extended charlie"), msg.toString());
 }
diff --git a/test/ChunkedEncodingTest.cc b/test/ChunkedEncodingTest.cc
index 1f5a4c7f..a0afae5a 100644
--- a/test/ChunkedEncodingTest.cc
+++ b/test/ChunkedEncodingTest.cc
@@ -30,17 +30,17 @@ CPPUNIT_TEST_SUITE_REGISTRATION( ChunkedEncodingTest );
 
 void ChunkedEncodingTest::testInflate1() {
   std::string msg = "a\r\n1234567890\r\n";
-  char buf[100];
+  unsigned char buf[100];
   int32_t len = sizeof(buf);
-  enc->inflate(buf, len, msg.c_str(), msg.size());
-  buf[len] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("1234567890"), std::string(buf));
+  enc->inflate(buf, len,
+	       reinterpret_cast<const unsigned char*>(msg.c_str()), msg.size());
+  CPPUNIT_ASSERT_EQUAL(std::string("1234567890"), std::string(&buf[0], &buf[len]));
   // second pass
   len = sizeof(buf);
   msg = "3;extensionIgnored\r\n123\r\n0\r\n";
-  enc->inflate(buf, len, msg.c_str(), msg.size());
-  buf[len] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("123"), std::string(buf));
+  enc->inflate(buf, len,
+	       reinterpret_cast<const unsigned char*>(msg.c_str()), msg.size());
+  CPPUNIT_ASSERT_EQUAL(std::string("123"), std::string(&buf[0], &buf[len]));
   // input is over
   CPPUNIT_ASSERT(enc->finished());
 }
@@ -53,16 +53,16 @@ void ChunkedEncodingTest::testInflateLargeChunk() {
   }
   std::string body;
   is >> body;
-  char buf[4097];
+  unsigned char buf[4097];
   int32_t len = sizeof(buf);
   for(int i = 0; i < 2; i++) {
     std::string msg = "1000\r\n"+body+"\r\n";
     len = sizeof(buf);
-    enc->inflate(buf, len, msg.c_str(), msg.size());
-    buf[len] = '\0';
-    CPPUNIT_ASSERT_EQUAL(body, std::string(buf));
+    enc->inflate(buf, len,
+		 reinterpret_cast<const unsigned char*>(msg.c_str()), msg.size());
+    CPPUNIT_ASSERT_EQUAL(body, std::string(&buf[0], &buf[len]));
   }
-  enc->inflate(buf, len, "0\r\n", 3);
+  enc->inflate(buf, len, reinterpret_cast<const unsigned char*>("0\r\n"), 3);
   CPPUNIT_ASSERT_EQUAL((int32_t)0, len);
   CPPUNIT_ASSERT(enc->finished());
 }
diff --git a/test/DHTAnnouncePeerMessageTest.cc b/test/DHTAnnouncePeerMessageTest.cc
index 342aed50..c2dd6dff 100644
--- a/test/DHTAnnouncePeerMessageTest.cc
+++ b/test/DHTAnnouncePeerMessageTest.cc
@@ -46,7 +46,7 @@ void DHTAnnouncePeerMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
@@ -66,7 +66,7 @@ void DHTAnnouncePeerMessageTest::testGetBencodedMessage()
   cm->put("q", new Data("announce_peer"));
   Dictionary* a = new Dictionary();
   cm->put("a", a);
-  a->put("id", new Data(reinterpret_cast<const char*>(localNode->getID()), DHT_ID_LENGTH));
+  a->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
   a->put("info_hash", new Data(infoHash, DHT_ID_LENGTH));
   a->put("port", new Data(Util::uitos(port), true));
   a->put("token", new Data(token));
@@ -85,7 +85,7 @@ void DHTAnnouncePeerMessageTest::testDoReceivedAction()
   remoteNode->setIPAddress("192.168.0.1");
   remoteNode->setPort(6881);
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
diff --git a/test/DHTAnnouncePeerReplyMessageTest.cc b/test/DHTAnnouncePeerReplyMessageTest.cc
index 0534a31f..a266bd63 100644
--- a/test/DHTAnnouncePeerReplyMessageTest.cc
+++ b/test/DHTAnnouncePeerReplyMessageTest.cc
@@ -31,7 +31,7 @@ void DHTAnnouncePeerReplyMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
diff --git a/test/DHTConnectionImplTest.cc b/test/DHTConnectionImplTest.cc
index 21b531c0..a6f9cb6c 100644
--- a/test/DHTConnectionImplTest.cc
+++ b/test/DHTConnectionImplTest.cc
@@ -30,16 +30,17 @@ void DHTConnectionImplTest::testWriteAndReadData()
     uint16_t con2port = con2.bind(0);
 
     std::string message1 = "hello world.";
-    con1.sendMessage(message1.c_str(), message1.size(), "127.0.0.1", con2port);
+    con1.sendMessage(reinterpret_cast<const unsigned char*>(message1.c_str()),
+		     message1.size(), "127.0.0.1", con2port);
 
-    char readbuffer[100];
+    unsigned char readbuffer[100];
     std::string remoteHost;
     uint16_t remotePort;
     {
       ssize_t rlength = con2.receiveMessage(readbuffer, sizeof(readbuffer), remoteHost, remotePort);
       CPPUNIT_ASSERT_EQUAL((ssize_t)message1.size(), rlength);
-      readbuffer[rlength] = '\0';
-      CPPUNIT_ASSERT_EQUAL(message1, std::string(readbuffer));
+      CPPUNIT_ASSERT_EQUAL(message1,
+			   std::string(&readbuffer[0], &readbuffer[rlength]));
     }
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
diff --git a/test/DHTFindNodeMessageTest.cc b/test/DHTFindNodeMessageTest.cc
index 86dbeaa7..3b252831 100644
--- a/test/DHTFindNodeMessageTest.cc
+++ b/test/DHTFindNodeMessageTest.cc
@@ -51,7 +51,7 @@ void DHTFindNodeMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
@@ -67,8 +67,8 @@ void DHTFindNodeMessageTest::testGetBencodedMessage()
   cm->put("q", new Data("find_node"));
   Dictionary* a = new Dictionary();
   cm->put("a", a);
-  a->put("id", new Data(reinterpret_cast<const char*>(localNode->getID()), DHT_ID_LENGTH));
-  a->put("target", new Data(reinterpret_cast<const char*>(targetNode->getID()), DHT_ID_LENGTH));
+  a->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
+  a->put("target", new Data(targetNode->getID(), DHT_ID_LENGTH));
 
   BencodeVisitor v;
   cm->accept(&v);
@@ -81,7 +81,7 @@ void DHTFindNodeMessageTest::testDoReceivedAction()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
diff --git a/test/DHTFindNodeReplyMessageTest.cc b/test/DHTFindNodeReplyMessageTest.cc
index 5a790a26..6410a885 100644
--- a/test/DHTFindNodeReplyMessageTest.cc
+++ b/test/DHTFindNodeReplyMessageTest.cc
@@ -33,7 +33,7 @@ void DHTFindNodeReplyMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
@@ -46,7 +46,7 @@ void DHTFindNodeReplyMessageTest::testGetBencodedMessage()
     nodes[i]->setIPAddress("192.168.0."+Util::uitos(i+1));
     nodes[i]->setPort(6881+i);
 
-    char buf[6];
+    unsigned char buf[6];
     CPPUNIT_ASSERT(PeerMessageUtil::createcompact(buf, nodes[i]->getIPAddress(), nodes[i]->getPort()));
     compactNodeInfo +=
       std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+
@@ -61,7 +61,7 @@ void DHTFindNodeReplyMessageTest::testGetBencodedMessage()
   cm->put("y", new Data("r"));
   Dictionary* r = new Dictionary();
   cm->put("r", r);
-  r->put("id", new Data(reinterpret_cast<const char*>(localNode->getID()), DHT_ID_LENGTH));
+  r->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
   r->put("nodes", new Data(compactNodeInfo));
 
   BencodeVisitor v;
diff --git a/test/DHTGetPeersMessageTest.cc b/test/DHTGetPeersMessageTest.cc
index 3efaf9d3..1eb27d73 100644
--- a/test/DHTGetPeersMessageTest.cc
+++ b/test/DHTGetPeersMessageTest.cc
@@ -69,7 +69,7 @@ void DHTGetPeersMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
@@ -86,7 +86,7 @@ void DHTGetPeersMessageTest::testGetBencodedMessage()
   cm->put("q", new Data("get_peers"));
   Dictionary* a = new Dictionary();
   cm->put("a", a);
-  a->put("id", new Data(reinterpret_cast<const char*>(localNode->getID()), DHT_ID_LENGTH));
+  a->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
   a->put("info_hash", new Data(infoHash, DHT_ID_LENGTH));
 
   BencodeVisitor v;
@@ -103,7 +103,7 @@ void DHTGetPeersMessageTest::testDoReceivedAction()
   remoteNode->setIPAddress("192.168.0.1");
   remoteNode->setPort(6881);
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
diff --git a/test/DHTGetPeersReplyMessageTest.cc b/test/DHTGetPeersReplyMessageTest.cc
index b8b40f46..59716020 100644
--- a/test/DHTGetPeersReplyMessageTest.cc
+++ b/test/DHTGetPeersReplyMessageTest.cc
@@ -35,7 +35,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
@@ -48,7 +48,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage()
   cm->put("y", new Data("r"));
   Dictionary* r = new Dictionary();
   cm->put("r", r);
-  r->put("id", new Data(reinterpret_cast<const char*>(localNode->getID()), DHT_ID_LENGTH));
+  r->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
   r->put("token", new Data(token));
 
   {
@@ -59,7 +59,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage()
       nodes[i]->setIPAddress("192.168.0."+Util::uitos(i+1));
       nodes[i]->setPort(6881+i);
       
-      char buf[6];
+      unsigned char buf[6];
       CPPUNIT_ASSERT(PeerMessageUtil::createcompact(buf, nodes[i]->getIPAddress(), nodes[i]->getPort()));
       compactNodeInfo +=
 	std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+
@@ -84,7 +84,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage()
     r->put("values", values);
     for(size_t i = 0; i < 4; ++i) {
       SharedHandle<Peer> peer = new Peer("192.168.0."+Util::uitos(i+1), 6881+i);
-      char buffer[6];
+      unsigned char buffer[6];
       CPPUNIT_ASSERT(PeerMessageUtil::createcompact(buffer, peer->ipaddr, peer->port));
       values->add(new Data(buffer, sizeof(buffer)));
       peers.push_back(peer);
diff --git a/test/DHTMessageFactoryImplTest.cc b/test/DHTMessageFactoryImplTest.cc
index a3c2ad0b..868836ac 100644
--- a/test/DHTMessageFactoryImplTest.cc
+++ b/test/DHTMessageFactoryImplTest.cc
@@ -163,7 +163,7 @@ void DHTMessageFactoryImplTest::testCreateFindNodeReplyMessage()
       nodes[i]->setIPAddress("192.168.0."+Util::uitos(i+1));
       nodes[i]->setPort(6881+i);
 
-      char buf[6];
+      unsigned char buf[6];
       CPPUNIT_ASSERT(PeerMessageUtil::createcompact(buf, nodes[i]->getIPAddress(), nodes[i]->getPort()));
       compactNodeInfo +=
 	std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+
@@ -232,7 +232,7 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage_nodes()
       nodes[i]->setIPAddress("192.168.0."+Util::uitos(i+1));
       nodes[i]->setPort(6881+i);
 
-      char buf[6];
+      unsigned char buf[6];
       CPPUNIT_ASSERT(PeerMessageUtil::createcompact(buf, nodes[i]->getIPAddress(), nodes[i]->getPort()));
       compactNodeInfo +=
 	std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+
@@ -276,7 +276,7 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage_values()
     r->put("values", values);
     for(size_t i = 0; i < 4; ++i) {
       SharedHandle<Peer> peer = new Peer("192.168.0."+Util::uitos(i+1), 6881+i);
-      char buffer[6];
+      unsigned char buffer[6];
       CPPUNIT_ASSERT(PeerMessageUtil::createcompact(buffer, peer->ipaddr, peer->port));
       values->add(new Data(buffer, sizeof(buffer)));
       peers.push_back(peer);
diff --git a/test/DHTPingMessageTest.cc b/test/DHTPingMessageTest.cc
index 686c0f90..bbd3c7fe 100644
--- a/test/DHTPingMessageTest.cc
+++ b/test/DHTPingMessageTest.cc
@@ -48,7 +48,7 @@ void DHTPingMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
@@ -62,7 +62,7 @@ void DHTPingMessageTest::testGetBencodedMessage()
   cm->put("q", new Data("ping"));
   Dictionary* a = new Dictionary();
   cm->put("a", a);
-  a->put("id", new Data(reinterpret_cast<const char*>(localNode->getID()), DHT_ID_LENGTH));
+  a->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
 
   BencodeVisitor v;
   cm->accept(&v);
@@ -75,7 +75,7 @@ void DHTPingMessageTest::testDoReceivedAction()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
diff --git a/test/DHTPingReplyMessageTest.cc b/test/DHTPingReplyMessageTest.cc
index df4e9ca5..aac99565 100644
--- a/test/DHTPingReplyMessageTest.cc
+++ b/test/DHTPingReplyMessageTest.cc
@@ -31,14 +31,14 @@ void DHTPingReplyMessageTest::testGetBencodedMessage()
   SharedHandle<DHTNode> localNode = new DHTNode();
   SharedHandle<DHTNode> remoteNode = new DHTNode();
 
-  char tid[DHT_TRANSACTION_ID_LENGTH];
+  unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
   DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
   std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
 
-  char id[DHT_ID_LENGTH];
+  unsigned char id[DHT_ID_LENGTH];
   DHTUtil::generateRandomData(id, DHT_ID_LENGTH);
 
-  DHTPingReplyMessage msg(localNode, remoteNode, (const unsigned char*)id, transactionID);
+  DHTPingReplyMessage msg(localNode, remoteNode, id, transactionID);
 
   std::string msgbody = msg.getBencodedMessage();
 
diff --git a/test/DHTRoutingTableSerializerTest.cc b/test/DHTRoutingTableSerializerTest.cc
index 844212c0..36eeca8e 100644
--- a/test/DHTRoutingTableSerializerTest.cc
+++ b/test/DHTRoutingTableSerializerTest.cc
@@ -108,7 +108,8 @@ void DHTRoutingTableSerializerTest::testSerialize()
   // 6bytes compact peer info
   ss.read(buf, 6);
   {
-    std::pair<std::string, uint16_t> peer = PeerMessageUtil::unpackcompact(buf);
+    std::pair<std::string, uint16_t> peer =
+      PeerMessageUtil::unpackcompact(reinterpret_cast<const unsigned char*>(buf));
     CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer.first);
     CPPUNIT_ASSERT_EQUAL((uint16_t)6881, peer.second);
   }
@@ -166,7 +167,8 @@ void DHTRoutingTableSerializerTest::testSerialize()
   // 6bytes compact peer info
   ss.read(buf, 6);
   {
-    std::pair<std::string, uint16_t> peer = PeerMessageUtil::unpackcompact(buf);
+    std::pair<std::string, uint16_t> peer =
+      PeerMessageUtil::unpackcompact(reinterpret_cast<const unsigned char*>(buf));
     CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.3"), peer.first);
     CPPUNIT_ASSERT_EQUAL((uint16_t)6883, peer.second);
   }
diff --git a/test/DHTTokenTrackerTest.cc b/test/DHTTokenTrackerTest.cc
index 3c7c29cc..2f050b05 100644
--- a/test/DHTTokenTrackerTest.cc
+++ b/test/DHTTokenTrackerTest.cc
@@ -26,7 +26,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DHTTokenTrackerTest);
 void DHTTokenTrackerTest::testGenerateToken()
 {
   unsigned char infohash[DHT_ID_LENGTH];
-  DHTUtil::generateRandomData(reinterpret_cast<char*>(infohash), DHT_ID_LENGTH);
+  DHTUtil::generateRandomData(infohash, DHT_ID_LENGTH);
   std::string ipaddr = "192.168.0.1";
   uint16_t port = 6881;
   
diff --git a/test/DHTUnknownMessageTest.cc b/test/DHTUnknownMessageTest.cc
index b3597684..2e72517b 100644
--- a/test/DHTUnknownMessageTest.cc
+++ b/test/DHTUnknownMessageTest.cc
@@ -30,7 +30,9 @@ void DHTUnknownMessageTest::testToString()
   {
     // data.size() > 8
     std::string data = "chocolate";
-    DHTUnknownMessage msg(localNode, data.c_str(), data.size(),
+    DHTUnknownMessage msg(localNode,
+			  reinterpret_cast<const unsigned char*>(data.c_str()),
+			  data.size(),
 			  ipaddr, port);
 
     CPPUNIT_ASSERT_EQUAL(std::string("dht unknown Remote:192.168.0.1:6881 length=9, first 8 bytes(hex)=63686f636f6c6174"), msg.toString());
@@ -38,7 +40,9 @@ void DHTUnknownMessageTest::testToString()
   {
     // data.size() == 3
     std::string data = "foo";
-    DHTUnknownMessage msg(localNode, data.c_str(), data.size(),
+    DHTUnknownMessage msg(localNode,
+			  reinterpret_cast<const unsigned char*>(data.c_str()),
+			  data.size(),
 			  ipaddr, port);
 
     CPPUNIT_ASSERT_EQUAL(std::string("dht unknown Remote:192.168.0.1:6881 length=3, first 8 bytes(hex)=666f6f"), msg.toString());
diff --git a/test/DataTest.cc b/test/DataTest.cc
index e8a10b9e..e2ef3762 100644
--- a/test/DataTest.cc
+++ b/test/DataTest.cc
@@ -41,7 +41,7 @@ void DataTest::testGetData() {
   CPPUNIT_ASSERT_EQUAL((int32_t)5, data.getLen());  
 
   Data null(reinterpret_cast<const char*>(0), 0);
-  CPPUNIT_ASSERT_EQUAL((const char*)NULL, null.getData());
+  CPPUNIT_ASSERT(null.getData() == 0);
   CPPUNIT_ASSERT_EQUAL((int32_t)0, null.getLen());
 
 }
diff --git a/test/DefaultBtAnnounceTest.cc b/test/DefaultBtAnnounceTest.cc
index d86ea5ca..e1605338 100644
--- a/test/DefaultBtAnnounceTest.cc
+++ b/test/DefaultBtAnnounceTest.cc
@@ -57,7 +57,7 @@ public:
     _btContext->setInfoHash(infoHash);
     _btContext->setTotalLength(totalLength);
     _btContext->setPieceLength(pieceLength);
-    _btContext->setPeerId((const unsigned char*)peerId.c_str());
+    _btContext->setPeerId(reinterpret_cast<const unsigned char*>(peerId.c_str()));
 
     _pieceStorage = new MockPieceStorage();
     _pieceStorage->setTotalLength(totalLength);
@@ -288,7 +288,7 @@ void DefaultBtAnnounceTest::testProcessAnnounceResponse_malformed()
 {
   try {
     std::string res = "i123e";
-    DefaultBtAnnounce(new MockBtContext(), _option).processAnnounceResponse(res.c_str(), res.size());
+    DefaultBtAnnounce(new MockBtContext(), _option).processAnnounceResponse(reinterpret_cast<const unsigned char*>(res.c_str()), res.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -300,7 +300,7 @@ void DefaultBtAnnounceTest::testProcessAnnounceResponse_failureReason()
 {
   try {
     std::string res = "d14:failure reason11:hello worlde";
-    DefaultBtAnnounce(new MockBtContext(), _option).processAnnounceResponse(res.c_str(), res.size());
+    DefaultBtAnnounce(new MockBtContext(), _option).processAnnounceResponse(reinterpret_cast<const unsigned char*>(res.c_str()), res.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -320,7 +320,7 @@ void DefaultBtAnnounceTest::testProcessAnnounceResponse()
     "e";
   
   DefaultBtAnnounce an(new MockBtContext(), _option);
-  an.processAnnounceResponse(res.c_str(), res.size());
+  an.processAnnounceResponse(reinterpret_cast<const unsigned char*>(res.c_str()), res.size());
   CPPUNIT_ASSERT_EQUAL(std::string("foo"), an.getTrackerID());
   CPPUNIT_ASSERT_EQUAL(3000, an.getInterval());
   CPPUNIT_ASSERT_EQUAL(1800, an.getMinInterval());
diff --git a/test/DefaultBtContextTest.cc b/test/DefaultBtContextTest.cc
index fec3c6b3..ce9c4c48 100644
--- a/test/DefaultBtContextTest.cc
+++ b/test/DefaultBtContextTest.cc
@@ -323,7 +323,7 @@ void DefaultBtContextTest::testLoadFromMemory()
   std::string memory = "d8:announce36:http://aria.rednoah.com/announce.php13:announce-listll16:http://tracker1 el15:http://tracker2el15:http://tracker3ee7:comment17:REDNOAH.COM RULES13:creation datei1123456789e4:infod5:filesld6:lengthi284e4:pathl5:aria23:src6:aria2ceed6:lengthi100e4:pathl19:aria2-0.2.2.tar.bz2eee4:name10:aria2-test12:piece lengthi128e6:pieces60:AAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCee";
 
   DefaultBtContext btContext;
-  btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+  btContext.loadFromMemory(memory, "default");
 
   std::string correctHash = "248d0a1cd08284299de78d5c1ed359bb46717d8c";
 
@@ -338,7 +338,7 @@ void DefaultBtContextTest::testLoadFromMemory_somethingMissing()
   try {
     std::string memory = "d8:announce36:http://aria.rednoah.com/announce.php4:infod4:name13:aria2.tar.bz26:lengthi262144eee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -358,7 +358,7 @@ void DefaultBtContextTest::testGetNodes()
       "6:pieces20:AAAAAAAAAAAAAAAAAAAA"
       "ee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
 
     const std::deque<std::pair<std::string, uint16_t> >& nodes =
       btContext.getNodes();
@@ -379,7 +379,7 @@ void DefaultBtContextTest::testGetNodes()
       "6:pieces20:AAAAAAAAAAAAAAAAAAAA"
       "ee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
 
     const std::deque<std::pair<std::string, uint16_t> >& nodes =
       btContext.getNodes();
@@ -398,7 +398,7 @@ void DefaultBtContextTest::testGetNodes()
       "6:pieces20:AAAAAAAAAAAAAAAAAAAA"
       "ee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
 
     const std::deque<std::pair<std::string, uint16_t> >& nodes =
       btContext.getNodes();
@@ -417,7 +417,7 @@ void DefaultBtContextTest::testGetNodes()
       "6:pieces20:AAAAAAAAAAAAAAAAAAAA"
       "ee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
 
     const std::deque<std::pair<std::string, uint16_t> >& nodes =
       btContext.getNodes();
@@ -435,7 +435,7 @@ void DefaultBtContextTest::testGetNodes()
       "6:pieces20:AAAAAAAAAAAAAAAAAAAA"
       "ee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
 
     const std::deque<std::pair<std::string, uint16_t> >& nodes =
       btContext.getNodes();
@@ -452,7 +452,7 @@ void DefaultBtContextTest::testGetNodes()
       "6:pieces20:AAAAAAAAAAAAAAAAAAAA"
       "ee";
     DefaultBtContext btContext;
-    btContext.loadFromMemory(memory.c_str(), memory.size(), "default");
+    btContext.loadFromMemory(memory, "default");
 
     const std::deque<std::pair<std::string, uint16_t> >& nodes =
       btContext.getNodes();
diff --git a/test/DefaultExtensionMessageFactoryTest.cc b/test/DefaultExtensionMessageFactoryTest.cc
index 65b9f168..c46e0b7a 100644
--- a/test/DefaultExtensionMessageFactoryTest.cc
+++ b/test/DefaultExtensionMessageFactoryTest.cc
@@ -69,7 +69,8 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_unknown()
   std::string data = std::string(&id[0], &id[1]);
   try {
     // this test fails because localhost doesn't have extension id = 255.
-    factory.createMessage(data.c_str(), data.size());
+    factory.createMessage(reinterpret_cast<const unsigned char*>(data.c_str()),
+			  data.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -87,7 +88,8 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_Handshake()
 
   std::string data = std::string(&id[0], &id[1])+"d1:v5:aria2e";
   SharedHandle<HandshakeExtensionMessage> m =
-    factory.createMessage(data.c_str(), data.size());
+    factory.createMessage(reinterpret_cast<const unsigned char*>(data.c_str()),
+			  data.size());
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), m->getClientVersion());
 }
 
@@ -97,10 +99,10 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_UTPex()
   factory.setBtContext(_btContext);
   factory.setPeer(_peer);
   
-  char c1[6];
-  char c2[6];
-  char c3[6];
-  char c4[6];
+  unsigned char c1[6];
+  unsigned char c2[6];
+  unsigned char c3[6];
+  unsigned char c4[6];
   PeerMessageUtil::createcompact(c1, "192.168.0.1", 6881);
   PeerMessageUtil::createcompact(c2, "10.1.1.2", 9999);
   PeerMessageUtil::createcompact(c3, "192.168.0.2", 6882);
@@ -115,7 +117,8 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_UTPex()
     "e";
 
   SharedHandle<UTPexExtensionMessage> m =
-    factory.createMessage(data.c_str(), data.size());
+    factory.createMessage(reinterpret_cast<const unsigned char*>(data.c_str()),
+			  data.size());
   CPPUNIT_ASSERT_EQUAL(factory.getExtensionMessageID("ut_pex"),
 		       m->getExtensionMessageID());
 }
diff --git a/test/DefaultPeerListProcessorTest.cc b/test/DefaultPeerListProcessorTest.cc
index 9a6e4638..f7a1b158 100644
--- a/test/DefaultPeerListProcessorTest.cc
+++ b/test/DefaultPeerListProcessorTest.cc
@@ -30,7 +30,7 @@ void DefaultPeerListProcessorTest::testExtractPeer() {
   DefaultPeerListProcessor proc(1024*1024, 10*1024*1024);
   std::string peersString = "d5:peersld2:ip11:192.168.0.17:peer id20:aria2-000000000000004:porti2006eeee";
 
-  Dictionary* dic = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* dic = (Dictionary*)MetaFileUtil::bdecoding(peersString);
   
   CPPUNIT_ASSERT(proc.canHandle(dic->get("peers")));
 
@@ -45,7 +45,7 @@ void DefaultPeerListProcessorTest::testExtract2Peers() {
   DefaultPeerListProcessor proc(1024*1024, 10*1024*1024);
   std::string peersString = "d5:peersld2:ip11:192.168.0.17:peer id20:aria2-000000000000004:porti2006eed2:ip11:192.168.0.27:peer id20:aria2-000000000000004:porti2007eeee";
 
-  Dictionary* dic = (Dictionary*)MetaFileUtil::bdecoding(peersString.c_str(), peersString.size());
+  Dictionary* dic = (Dictionary*)MetaFileUtil::bdecoding(peersString);
 
   std::deque<SharedHandle<Peer> > peers = proc.extractPeer(dic->get("peers"));
   CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size());
diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc
index a31dad20..4851df9b 100644
--- a/test/HandshakeExtensionMessageTest.cc
+++ b/test/HandshakeExtensionMessageTest.cc
@@ -95,7 +95,8 @@ void HandshakeExtensionMessageTest::testCreate()
 {
   std::string in = "0d1:pi6881e1:v5:aria21:md6:ut_pexi1eee";
   SharedHandle<HandshakeExtensionMessage> m =
-    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    HandshakeExtensionMessage::create(reinterpret_cast<const unsigned char*>(in.c_str()),
+				      in.size());
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), m->getClientVersion());
   CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getTCPPort());
   CPPUNIT_ASSERT_EQUAL((uint8_t)1, m->getExtensionMessageID("ut_pex"));
@@ -103,7 +104,8 @@ void HandshakeExtensionMessageTest::testCreate()
   try {
     // bad payload format
     std::string in = "011:hello world";
-    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    HandshakeExtensionMessage::create(reinterpret_cast<const unsigned char*>(in.c_str()),
+				      in.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -112,7 +114,8 @@ void HandshakeExtensionMessageTest::testCreate()
   try {
     // malformed dencoded message
     std::string in = "011:hello";
-    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    HandshakeExtensionMessage::create(reinterpret_cast<const unsigned char*>(in.c_str()),
+				      in.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -121,7 +124,8 @@ void HandshakeExtensionMessageTest::testCreate()
   try {
     // 0 length data
     std::string in = "";
-    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    HandshakeExtensionMessage::create(reinterpret_cast<const unsigned char*>(in.c_str()),
+				      in.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;
@@ -133,7 +137,8 @@ void HandshakeExtensionMessageTest::testCreate_stringnum()
 {
   std::string in = "0d1:p4:68811:v5:aria21:md6:ut_pex1:1ee";
   SharedHandle<HandshakeExtensionMessage> m =
-    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    HandshakeExtensionMessage::create(reinterpret_cast<const unsigned char*>(in.c_str()),
+				      in.size());
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), m->getClientVersion());
   CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getTCPPort());
   CPPUNIT_ASSERT_EQUAL((uint8_t)1, m->getExtensionMessageID("ut_pex"));
diff --git a/test/HttpHeaderProcessorTest.cc b/test/HttpHeaderProcessorTest.cc
index dd1af1a2..f3e1b202 100644
--- a/test/HttpHeaderProcessorTest.cc
+++ b/test/HttpHeaderProcessorTest.cc
@@ -78,12 +78,13 @@ void HttpHeaderProcessorTest::testGetPutBackDataLength()
 void HttpHeaderProcessorTest::testGetPutBackDataLength_nullChar()
 {
   HttpHeaderProcessor proc;
-  proc.update("HTTP/1.1 200 OK\r\n"
-	      "foo: foo\0bar\r\n"
-	      "\r\nputbackme", 35+7);
+  const char* x = "HTTP/1.1 200 OK\r\n"
+    "foo: foo\0bar\r\n"
+    "\r\nputbackme";
+  std::string hd1(&x[0], &x[42]);
+  proc.update(hd1);
   CPPUNIT_ASSERT(proc.eoh());
   CPPUNIT_ASSERT_EQUAL((int32_t)9, proc.getPutBackDataLength());
-  
 }
 
 void HttpHeaderProcessorTest::testGetHttpStatusHeader()
diff --git a/test/MetaFileUtilTest.cc b/test/MetaFileUtilTest.cc
index f300fab4..d42a4f09 100644
--- a/test/MetaFileUtilTest.cc
+++ b/test/MetaFileUtilTest.cc
@@ -35,8 +35,8 @@ void MetaFileUtilTest::testParseMetaFile() {
 
 void MetaFileUtilTest::testBdecoding() {
   try {
-    const char* str = "5:abcd";
-    MetaFileUtil::bdecoding(str, strlen(str));
+    std::string str = "5:abcd";
+    MetaFileUtil::bdecoding(str);
     CPPUNIT_FAIL("DlAbortEx exception must be thrown.");
   } catch(DlAbortEx* ex) {
     delete ex;
@@ -45,8 +45,8 @@ void MetaFileUtilTest::testBdecoding() {
   }
 
   try {
-    const char* str = "i1234";
-    MetaFileUtil::bdecoding(str, strlen(str));
+    std::string str = "i1234";
+    MetaFileUtil::bdecoding(str);
     CPPUNIT_FAIL("DlAbortEx exception must be thrown.");
   } catch(DlAbortEx* ex) {
     delete ex;
@@ -55,8 +55,8 @@ void MetaFileUtilTest::testBdecoding() {
   }
 
   try {
-    const char* str = "5abcd";
-    MetaFileUtil::bdecoding(str, strlen(str));
+    const std::string str = "5abcd";
+    MetaFileUtil::bdecoding(str);
     CPPUNIT_FAIL("DlAbortEx exception must be thrown.");
   } catch(DlAbortEx* ex) {
     delete ex;
@@ -65,8 +65,8 @@ void MetaFileUtilTest::testBdecoding() {
   }
 
   try {
-    const char* str = "d";
-    MetaFileUtil::bdecoding(str, strlen(str));
+    const std::string str = "d";
+    MetaFileUtil::bdecoding(str);
     CPPUNIT_FAIL("DlAbortEx exception must be thrown.");
   } catch(DlAbortEx* ex) {
     delete ex;
diff --git a/test/MockBtAnnounce.h b/test/MockBtAnnounce.h
index d70f0d49..3d596b80 100644
--- a/test/MockBtAnnounce.h
+++ b/test/MockBtAnnounce.h
@@ -42,7 +42,7 @@ public:
 
   virtual void resetAnnounce() {}
 
-  virtual void processAnnounceResponse(const char* trackerResponse,
+  virtual void processAnnounceResponse(const unsigned char* trackerResponse,
 				       size_t trackerResponseLength) {}
 
   virtual bool noMoreAnnounce() {
diff --git a/test/MockDHTMessageFactory.h b/test/MockDHTMessageFactory.h
index 88eee44e..2c4583e4 100644
--- a/test/MockDHTMessageFactory.h
+++ b/test/MockDHTMessageFactory.h
@@ -112,8 +112,8 @@ public:
   }
 
   virtual SharedHandle<DHTMessage>
-  createUnknownMessage(const char* data, size_t length, const std::string& ipaddr,
-		       uint16_t port)
+  createUnknownMessage(const unsigned char* data, size_t length,
+		       const std::string& ipaddr, uint16_t port)
   {
     return 0;
   }
diff --git a/test/MockExtensionMessage.h b/test/MockExtensionMessage.h
index 5a0e1b21..a3943d46 100644
--- a/test/MockExtensionMessage.h
+++ b/test/MockExtensionMessage.h
@@ -14,12 +14,20 @@ public:
 public:
   MockExtensionMessage(const std::string& extensionName,
 		       uint8_t extensionMessageID,
-		       const char* data,
+		       const unsigned char* data,
 		       size_t length):_extensionName(extensionName),
 				      _extensionMessageID(extensionMessageID),
 				      _data(&data[0], &data[length]),
 				      _doReceivedActionCalled(false) {}
 
+  MockExtensionMessage(const std::string& extensionName,
+		       uint8_t extensionMessageID,
+		       const std::string& data):
+    _extensionName(extensionName),
+    _extensionMessageID(extensionMessageID),
+    _data(data),
+    _doReceivedActionCalled(false) {}
+
   virtual ~MockExtensionMessage() {}
 
   virtual std::string getBencodedData()
diff --git a/test/MockExtensionMessageFactory.h b/test/MockExtensionMessageFactory.h
index 3107f349..c87bd5c4 100644
--- a/test/MockExtensionMessageFactory.h
+++ b/test/MockExtensionMessageFactory.h
@@ -10,7 +10,7 @@ class MockExtensionMessageFactory:public ExtensionMessageFactory {
 public:
   virtual ~MockExtensionMessageFactory() {}
 
-  virtual SharedHandle<ExtensionMessage> createMessage(const char* data,
+  virtual SharedHandle<ExtensionMessage> createMessage(const unsigned char* data,
 						       size_t length)
   {
     return new MockExtensionMessage("a2_mock", *data, data+1, length-1);
diff --git a/test/PeerMessageUtilTest.cc b/test/PeerMessageUtilTest.cc
index 4b4e8126..f0340693 100644
--- a/test/PeerMessageUtilTest.cc
+++ b/test/PeerMessageUtilTest.cc
@@ -41,7 +41,7 @@ void createNLengthMessage(char* msg, int msgLen, int payloadLen, int id) {
 
 void PeerMessageUtilTest::testCreateCompact()
 {
-  char compact[6];
+  unsigned char compact[6];
   CPPUNIT_ASSERT(PeerMessageUtil::createcompact(compact, "::ffff:127.0.0.1", 6881));
 
   std::pair<std::string, uint16_t> p = PeerMessageUtil::unpackcompact(compact);
diff --git a/test/UTPexExtensionMessageTest.cc b/test/UTPexExtensionMessageTest.cc
index e7014053..aa8e2cc5 100644
--- a/test/UTPexExtensionMessageTest.cc
+++ b/test/UTPexExtensionMessageTest.cc
@@ -83,10 +83,10 @@ void UTPexExtensionMessageTest::testGetBencodedData()
   SharedHandle<Peer> p4 = new Peer("10.1.1.3", 10000);
   msg.addDroppedPeer(p4);
 
-  char c1[6];
-  char c2[6];
-  char c3[6];
-  char c4[6];
+  unsigned char c1[6];
+  unsigned char c2[6];
+  unsigned char c3[6];
+  unsigned char c4[6];
   PeerMessageUtil::createcompact(c1, p1->ipaddr, p1->port);
   PeerMessageUtil::createcompact(c2, p2->ipaddr, p2->port);
   PeerMessageUtil::createcompact(c3, p3->ipaddr, p3->port);
@@ -153,10 +153,10 @@ void UTPexExtensionMessageTest::testCreate()
   _btContext->setPieceLength(256*1024);
   _btContext->setTotalLength(1024*1024);
 
-  char c1[6];
-  char c2[6];
-  char c3[6];
-  char c4[6];
+  unsigned char c1[6];
+  unsigned char c2[6];
+  unsigned char c3[6];
+  unsigned char c4[6];
   PeerMessageUtil::createcompact(c1, "192.168.0.1", 6881);
   PeerMessageUtil::createcompact(c2, "10.1.1.2", 9999);
   PeerMessageUtil::createcompact(c3, "192.168.0.2", 6882);
@@ -171,7 +171,9 @@ void UTPexExtensionMessageTest::testCreate()
     "e";
   
   SharedHandle<UTPexExtensionMessage> msg =
-    UTPexExtensionMessage::create(_btContext, data.c_str(), data.size());
+    UTPexExtensionMessage::create(_btContext,
+				  reinterpret_cast<const unsigned char*>(data.c_str()),
+				  data.size());
   CPPUNIT_ASSERT_EQUAL((uint8_t)1, msg->getExtensionMessageID());
   CPPUNIT_ASSERT_EQUAL((size_t)2, msg->getFreshPeers().size());
   CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), msg->getFreshPeers()[0]->ipaddr);
@@ -186,7 +188,9 @@ void UTPexExtensionMessageTest::testCreate()
   try {
     // 0 length data
     std::string in = "";
-    UTPexExtensionMessage::create(_btContext, in.c_str(), in.size());
+    UTPexExtensionMessage::create(_btContext,
+				  reinterpret_cast<const unsigned char*>(in.c_str()),
+				  in.size());
     CPPUNIT_FAIL("exception must be thrown.");
   } catch(Exception* e) {
     std::cerr << *e << std::endl;