changeset 2947:6ff720005ecc draft

Merge branch '0.5.x' into 0.6.0.x Conflicts: bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
author Luke Dashjr <luke-jr+git@utopios.org>
date Fri, 27 Apr 2012 10:57:15 -0400
parents 0bda0fe7f025 (current diff) 3d43fc6fb29e (diff)
children 6f65064fcec4
files bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/bitcoinrpc.cpp src/main.h src/net.cpp src/protocol.cpp src/protocol.h src/serialize.h
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1404,8 +1404,8 @@
 {
     if (fHelp)
         throw runtime_error(
-            "listsinceblock [blockid] [target-confirmations]\n"
-            "Get all transactions in blocks since block [blockid], or all transactions if omitted");
+            "listsinceblock [blockhash] [target-confirmations]\n"
+            "Get all transactions in blocks since block [blockhash], or all transactions if omitted");
 
     CBlockIndex *pindex = NULL;
     int target_confirms = 1;
@@ -1442,7 +1442,6 @@
 
     if (target_confirms == 1)
     {
-        printf("oops!\n");
         lastblock = hashBestChain;
     }
     else
--- a/src/main.h
+++ b/src/main.h
@@ -955,9 +955,10 @@
         fileout << FLATDATA(pchMessageStart) << nSize;
 
         // Write block
-        nBlockPosRet = ftell(fileout);
-        if (nBlockPosRet == -1)
+        long fileOutPos = ftell(fileout);
+        if (fileOutPos < 0)
             return error("CBlock::WriteToDisk() : ftell failed");
+        nBlockPosRet = fileOutPos;
         fileout << *this;
 
         // Flush stdio buffers and commit to disk before returning