- Small clean up.



git-svn-id: http://svn.tribler.org/libswift/branches/ppsp-03@31502 001aeff7-3401-0410-a489-f7902fc005dd

Author: arno

SConstruct

@@ -30,7 +30,6 @@ source = [ 'bin.cpp', 'binmap.cpp', 'sha1.cpp','hashtree.cpp',
 
 env = Environment()
 if sys.platform == "win32":
-    #libevent2path = '\\build\\libevent-2.0.19-stable'
     libevent2path = '\\build\\libevent-2.0.20-stable-debug'
 
     # "MSVC works out of the box". Sure.
@@ -74,9 +73,6 @@ if sys.platform == "win32":
     # Somehow linker can't find uuid.lib
     libpath += 'C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib;'
 
-    linkflags = '-Wl,-rpath,'+libevent2path+'/lib'
-    env.Append(LINKFLAGS=linkflags);
-
     # Make the swift.exe a Windows program not a Console program when used inside another prog
     linkflags = '/SUBSYSTEM:WINDOWS'
     if not DEBUG:
@@ -87,6 +83,8 @@ if sys.platform == "win32":
     APPSOURCE=['swift.cpp','statsgw.cpp','getopt.c','getopt_long.c']
 
 else:
+    # Linux or Mac build
+    
     libevent2path = '/arno/pkgs/libevent-2.0.15-arno-http'
 
     # Enable the user defining external includes

ext/live_picker.cpp

@@ -76,14 +76,12 @@ class SimpleLivePiecePicker : public LivePiecePicker {
             hint_out_.pop_front();
         }
 
-        char binstr[32];
-
         // Advance ptr
         //dprintf("live: pp: new cur start\n" );
         while (transfer_->ack_out()->is_filled(current_bin_))
         {
             current_bin_ = bin_t(0,current_bin_.layer_offset()+1);
-            //fprintf(stderr,"live: pp: new cur is %s\n", current_bin_.str(binstr) );
+            //fprintf(stderr,"live: pp: new cur is %s\n", current_bin_.str().c_str() );
         }
         //dprintf("live: pp: new cur end\n" );
 
@@ -92,10 +90,10 @@ class SimpleLivePiecePicker : public LivePiecePicker {
         bin_t hint = pickLargestBin(offer,current_bin_);
         if (hint == bin_t::NONE)
         {
-            //dprintf("live: pp: Look beyond %s\n", current_bin_.str(binstr) );
+            //dprintf("live: pp: Look beyond %s\n", current_bin_.str().c_str() );
             // See if there is stuff to download beyond current bin
             hint = ack_hint_out_.find_empty(current_bin_);
-            //dprintf("live: pp: Empty is %s boe %llu boc %llu\n", hint.str(binstr), hint.toUInt(), current_bin_.toUInt() );
+            //dprintf("live: pp: Empty is %s boe %llu boc %llu\n", hint.str().c_str(), hint.toUInt(), current_bin_.toUInt() );
 
             // Safety catch, find_empty(offset) apparently buggy.
             if (hint.base_offset() <= current_bin_.base_offset())
@@ -108,7 +106,7 @@ class SimpleLivePiecePicker : public LivePiecePicker {
         if (hint == bin_t::NONE)
             return hint;
 
-        //dprintf("live: pp: Picked %s\n", hint.str(binstr) );
+        //dprintf("live: pp: Picked %s\n", hint.str().c_str() );
 
 	assert(ack_hint_out_.is_empty(hint));
 	ack_hint_out_.set(hint);
@@ -119,22 +117,21 @@ class SimpleLivePiecePicker : public LivePiecePicker {
 
     bin_t pickLargestBin(binmap_t& offer, bin_t starthint)
     {
-        char binstr[32];
 	bin_t hint;
         if (offer.is_filled(starthint) && ack_hint_out_.is_empty(starthint))
         {
             // See which is the largest bin that covers starthint
             bin_t goodhint = starthint;
             hint = starthint;
-            //dprintf("live: pp: new hint is %s\n", hint.str(binstr) );
+            //dprintf("live: pp: new hint is %s\n", hint.str().c_str() );
 
 	    while (hint.is_left() && offer.is_filled(hint.sibling()) && ack_hint_out_.is_empty(hint.sibling()))
 	    {
 		// hint is a left node and its sibling is filled, so we can
 		// request the parent too.
 		goodhint = hint;
 	        hint = hint.parent();
-	        //dprintf("live: pp: Going to parent %s\n", hint.str(binstr) );
+	        //dprintf("live: pp: Going to parent %s\n", hint.str().c_str() );
 	    }
 	    // Previous one was the max.
 	    return goodhint;
@@ -192,8 +189,6 @@ class SimpleLivePiecePicker : public LivePiecePicker {
 
     void EndAddPeerPos(uint32_t channelid)
     {
-    	char binstr[32];
-
     	if (!hooking_in_)
     	    return;
 

tests/binstest3.cpp

@@ -68,8 +68,6 @@ TEST(BinsTest,FindFiltered1c) {
     filter.reset(bin_t(1,4));
     //filter.reset(bin_t(0,13));
 
-    char binstr[32];
-
     bin_t s = bin_t(3,1);
     fprintf(stderr,"Searching 0,12x from %s ", s.base_left().str().c_str() );
     fprintf(stderr,"to %s\n", s.base_right().str().c_str() );
@@ -411,8 +409,6 @@ TEST(BinsTest,FindFiltered17) {
 	bin_t hint = bin_t::NONE;
 	while (hint.is_none() && layer <10)
 	{
-		char binstr[32];
-
 		bin_t curr = bin_t(layer++,0);
 		binmap.fill(offer);
 		binmap_t::copy(binmap, ack_hint_out, curr);
@@ -446,8 +442,6 @@ TEST(BinsTest,FindFiltered19) {
 	bin_t hint = bin_t::NONE;
 	while (!hint.contains(bin_t(292)))
 	{
-		char binstr[32];
-
 		twist = rand();
 
 		bin_t curr = bin_t(layer,0);
@@ -466,7 +460,6 @@ TEST(BinsTest,FindFiltered19) {
 		ack_hint_out.set(hint);
 	}
 
-	char binstr[32],binstr2[32];
 	EXPECT_EQ(bin_t(292),hint);
 }
 
@@ -506,8 +499,6 @@ TEST(BinsTest,FindFiltered20) {
 		fprintf(stderr,"Layer %d\n", layer );
 		while (!hint.contains(bin_t(292)))
 		{
-			char binstr[32];
-
 			twist = rand();
 
 			bin_t curr = bin_t(0,292/2);
@@ -539,8 +530,6 @@ void DoFindFilteredRiccardo(bin_t::uint_t twist)
     for(int i=0; i<1024; i+=2)
         filter.set(bin_t(0,i));
 
-    char binstr[32];
-
     // Case 1
     bin_t s(1,2);
     data.set(s);

tests/chunkaddrtest.cpp

@@ -92,7 +92,6 @@ TEST(ChunkAddrTest,Chunk32ToBin32b)
 {
     uint32_t sm = 269;
     uint32_t em = 312;
-    char binstr[32];
     for (uint32_t s=0; s<sm; s++)
     {
 	for (uint32_t e=s; e<s+em; e++)