Luke Dashjr
5da2dce524
Merge branch '0.4.x' into 0.5.x
2012-05-06 05:35:50 +00:00
Luke Dashjr
607739befb
Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead
...
Conflicts:
src/walletdb.cpp
2012-05-06 05:27:08 +00:00
Philip Kaufmann and Luke Dashjr
479c99022e
remove HTML code around "Wallet" (displayed on overview page) and use Qt tags for font settings
2012-05-05 16:15:38 +00:00
Luke Dashjr
c328c684c2
Bugfix: Remove redundant duplicate transaction check
2012-05-04 19:54:24 +00:00
Luke Dashjr
b2e5f797b5
Merge branch '0.4.x' into 0.5.x
2012-05-04 18:55:15 +00:00
Gavin Andresen and Luke Dashjr
6a89317f62
Check earlier for blocks with duplicate transactions. Fixes #1167
2012-05-04 18:55:05 +00:00
Gavin Andresen and Luke Dashjr
ad5a4c7c47
Check earlier for blocks with duplicate transactions. Fixes #1167
2012-05-04 18:52:16 +00:00
Philip Kaufmann and Luke Dashjr
cae1a68267
remove obsolete BackupWallet() entry in wallet.h
2012-05-04 17:41:13 +00:00
Philip Kaufmann and Luke Dashjr
6789e99e4f
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
2012-05-02 19:39:46 -04:00
Philip Kaufmann and Luke Dashjr
4898482915
fix compiler warning "suggest parentheses around assignment used as truth
...
value [-Wparentheses]" in util.cpp
2012-05-01 23:11:56 -04:00
Philip Kaufmann and Luke Dashjr
8edec3f9d6
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
2012-05-01 23:11:07 -04:00
Philip Kaufmann and Luke Dashjr
e6578e7fa7
remove unused typedef in serialize.h
2012-05-01 23:09:22 -04:00
Gavin Andresen and Luke Dashjr
813dc92cdc
fix compiler error in bitcoinrpc RE: boost::system
...
(Partial of 2232717cba )
2012-04-27 15:00:57 -04:00
Luke Dashjr
824e8dde8b
Merge branch '0.4.x' into 0.5.x
...
Conflicts:
doc/build-msw.txt
src/makefile.linux-mingw
src/makefile.mingw
2012-04-27 13:52:02 -04:00
Gavin Andresen and Luke Dashjr
b7a2b6e1aa
Windows build: compile against openssl 1.0.1b
2012-04-27 13:51:12 -04:00
Gavin Andresen and Luke Dashjr
5ad4028050
Windows build: compile against openssl 1.0.1b
2012-04-27 11:19:20 -04:00
Luke Dashjr
e5f43fe309
Bump version to 0.5.5
2012-04-27 10:55:06 -04:00
Luke Dashjr
ccfcdc2e3d
Merge branch '0.4.x' into 0.5.x
...
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/protocol.h
src/serialize.h
2012-04-27 10:53:14 -04:00
Luke Dashjr
c18b82d5db
Bump version to 0.4.6
2012-04-27 10:50:24 -04:00
freewil and Luke Dashjr
3eb5fdbf5f
listsinceblock: rpc param blockid -> blockhash
...
This is more consistent with the rest of the labeling seen
by the user when accessing the rpc commands.
2012-04-27 10:47:31 -04:00
freewil and Luke Dashjr
aff6456e8a
remove strange debug message from listsinceblock
2012-04-27 10:46:36 -04:00
Timothy Redaelli and Luke Dashjr
dfac636fd7
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
2012-04-27 10:42:37 -04:00
Timothy Redaelli and Luke Dashjr
282e3ffe6e
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
2012-04-27 10:41:52 -04:00
Jeff Garzik and Luke Dashjr
c21121752d
CBlock::WriteToDisk() properly checks ftell(3) for error return
...
Rather than storing ftell(3)'s return value -- a long -- in an
unsigned int, we store and check a properly typed temp. Then, assured a
non-negative value, we store in nBlockPosRet.
2012-04-24 01:00:15 -04:00
Luke Dashjr
a93ab87787
Merge branch '0.4.x' into 0.5.x
...
Conflicts:
src/main.cpp
2012-04-22 10:05:43 -04:00
Timothy Redaelli and Luke Dashjr
d0fe14ffec
Add missing includes. (Fix bulding under GCC 4.7)
...
(Note: GCC 4.7 build NOT tested with backports -Luke)
2012-04-22 09:41:51 -04:00
Dwayne C. Litzenberger and Luke Dashjr
e5b980d72f
Fix bugs on 'unsigned char' platforms.
...
In ISO C++, the signedness of 'char' is undefined. On some platforms (e.g.
ARM), 'char' is an unsigned type, but some of the code relies on 'char' being
signed (as it is on x86). This is indicated by compiler warnings like this:
bignum.h: In constructor 'CBigNum::CBigNum(char)':
bignum.h:81:59: warning: comparison is always true due to limited range of data type [-Wtype-limits]
util.cpp: In function 'bool IsHex(const string&)':
util.cpp:427:28: warning: comparison is always false due to limited range of data type [-Wtype-limits]
In particular, IsHex erroneously returned true regardless of the input
characters, as long as the length of the string was a positive multiple of 2.
Note: For testing, it's possible using GCC to force char to be unsigned by
adding the -funsigned-char parameter to xCXXFLAGS.
2012-04-22 09:38:27 -04:00
Dwayne C. Litzenberger and Luke Dashjr
bd043f19c8
Fix phexdigits[255] is undefined.
2012-04-22 09:26:11 -04:00
Pieter Wuille and Luke Dashjr
e401e5eb79
Add missing breaks in optionmodel's switch case
2012-04-17 20:30:31 -04:00
Pieter Wuille and Luke Dashjr
dc588faf59
Fix potential deadlock
...
Conflict:
* cs_main in ProcessMessages() (before calling ProcessMessages)
* cs_vSend in CNode::BeginMessage
versus:
* cs_vSend in ThreadMessageHandler2 (before calling SendMessages)
* cs_main in SendMessages
Even though cs_vSend is a try_lock, if it succeeds simultaneously with
the locking of cs_main in ProcessMessages(), it could cause a deadlock.
2012-04-17 15:11:48 -04:00
Jeff Garzik and Luke Dashjr
7f34351910
Fix misc. minor sign-comparison warnings
2012-04-17 15:08:18 -04:00
Jeff Garzik and Luke Dashjr
1b7e5cbcad
CNode's nHeaderStart may be negative, so change its type (PARTIAL)
2012-04-17 15:03:05 -04:00
Jeff Garzik and Luke Dashjr
774e9b6dbb
Fix loop index var types, fixing many minor sign comparison warnings
...
foo.size() typically returns an unsigned integral type; make loop variables
match those types' signedness.
2012-04-17 14:57:42 -04:00
Jeff Garzik and Luke Dashjr
ef2f3ddaf7
The string class returns string::npos, when find() fails.
...
Noticed when sign-comparison warnings were enabled.
2012-04-17 14:50:26 -04:00
Wladimir J. van der Laan and Luke Dashjr
d506c160eb
Add forgotten initializer
2012-04-17 14:49:36 -04:00
Jeff Garzik and Luke Dashjr
1175d8f6a1
AlreadyHave(): only hold lock during mapTransactions access
2012-04-17 14:40:58 -04:00
Jeff Garzik and Luke Dashjr
12570da46f
Locking fix for AlreadyHave()
...
Access to mapTransactions[] must be guarded by cs_mapTransactions lock.
2012-04-17 13:20:29 -04:00
Wladimir J. van der Laan and Luke Dashjr
e2ce6438a9
Set label when selecting an address that already has a label. Fixes #1080 .
2012-04-16 09:18:06 -04:00
Luke Dashjr
e73b792b1a
Merge branch '0.5.0.x' into 0.5.x
2012-04-15 21:06:10 -04:00
Luke Dashjr
79fc752b61
Merge branch '0.4.x' into 0.5.0.x
...
Conflicts:
src/keystore.h
2012-04-15 21:05:54 -04:00
Wladimir J. van der Laan and Luke Dashjr
8460185dec
fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
2012-04-15 19:43:41 -04:00
Wladimir J. van der Laan and Luke Dashjr
678a319888
fix warnings: delete called on 'XX' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor]
2012-04-15 19:42:19 -04:00
Wladimir J. van der Laan and Luke Dashjr
fdcafa3535
fix warnings: unused variable 'XX' [-Wunused-variable]
2012-04-15 19:37:34 -04:00
Wladimir J. van der Laan and Luke Dashjr
5f4fee559e
fix warnings: enumeration values 'XX' not handled in switch [-Wswitch-enum]
2012-04-15 19:28:48 -04:00
Wladimir J. van der Laan and Luke Dashjr
c4381587a6
fix warnings: 'XX' defined as a struct here but previously declared as a class [-Wmismatched-tags]
2012-04-15 19:28:34 -04:00
Wladimir J. van der Laan and Luke Dashjr
85e975f379
fix warnings: array subscript is of type 'char' [-Wchar-subscripts]
2012-04-15 19:28:09 -04:00
Wladimir J. van der Laan and Luke Dashjr
f650d62fc6
fix warnings: array subscript is of type 'char' [-Wchar-subscripts]
2012-04-15 19:28:00 -04:00
Wladimir J. van der Laan and Luke Dashjr
401db6d96b
work around issue in boost::program_options that prevents from compiling in clang
2012-04-15 19:23:01 -04:00
Wladimir J. van der Laan and Luke Dashjr
cb1035a008
Show a message box when runaway exception happens
...
This is more clear to users than when the program simply disappears (usually during initialization). It still logs the message to the console and debug log as well.
2012-04-15 13:25:35 -04:00
Luke Dashjr
79940a6793
Merge commit 'e962c7f' into 0.5.0.x
2012-04-15 13:23:43 -04:00