bugfix Db::open/close and zombie sockets bugs fix double-close of socket handle,

keep databases open,
close db cursors,
initial block download in batches of 500 blocks,
fix misc warnings,
subver linux-test8

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@40 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 5 insertions, 5 deletions

diff --git a/main.h b/main.h
index 8bb1e19e8a..79f14c6861 100644
--- a/main.h
+++ b/main.h
@@ -1009,9 +1009,9 @@ public:
     void print() const

     {

         printf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%d)\n",

-            GetHash().ToString().substr(0,14).c_str(),

+            GetHash().ToString().substr(0,16).c_str(),

             nVersion,

-            hashPrevBlock.ToString().substr(0,14).c_str(),

+            hashPrevBlock.ToString().substr(0,16).c_str(),

             hashMerkleRoot.ToString().substr(0,6).c_str(),

             nTime, nBits, nNonce,

             vtx.size());

@@ -1159,7 +1159,7 @@ public:
         return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nHeight=%d, merkle=%s, hashBlock=%s)",

             pprev, pnext, nFile, nBlockPos, nHeight,

             hashMerkleRoot.ToString().substr(0,6).c_str(),

-            GetBlockHash().ToString().substr(0,14).c_str());

+            GetBlockHash().ToString().substr(0,16).c_str());

     }

 

     void print() const

@@ -1229,8 +1229,8 @@ public:
         str += CBlockIndex::ToString();

         str += strprintf("\n                hashBlock=%s, hashPrev=%s, hashNext=%s)",

             GetBlockHash().ToString().c_str(),

-            hashPrev.ToString().substr(0,14).c_str(),

-            hashNext.ToString().substr(0,14).c_str());

+            hashPrev.ToString().substr(0,16).c_str(),

+            hashNext.ToString().substr(0,16).c_str());

         return str;

     }