Skip to content

Conversation

@paveljanik
Copy link
Contributor

Continues #8105.

Review of this should be pretty straight forward. Just compare binaries. View the diff in visual diff or so.

To provide tested ACK, cherrypick paveljanik/bitcoin@5d2f98e and compare master build log and this PR build log.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure promoting these return values up to the function scope is a good idea. Keeping the scope of variables as small as possible ensures that results won't leak or accidentally influence other things.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically speaking, this is not directly function scope.

But yes, one view is to have only one return value variable, the other is one return value variable per function call.

Renaming ret to ret1 here could make this particular change smaller.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'd prefer just renaming

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done and squashed - now all the changes are of the same kind.

@paveljanik paveljanik force-pushed the 20160611_shadowing_wallet branch from 0aa5728 to d5b25fa Compare June 27, 2016 12:57
@maflcko
Copy link
Member

maflcko commented Jun 29, 2016

ACK: objdump -d $bin returns the same binaries for me on d5b25fa

@paveljanik
Copy link
Contributor Author

more ACKs please

@sipa
Copy link
Member

sipa commented Aug 1, 2016

utACK d5b25fa5792b3899759a73059a87c6b015fc8535

@paveljanik paveljanik force-pushed the 20160611_shadowing_wallet branch from d5b25fa to b175cb7 Compare August 31, 2016 14:16
@paveljanik
Copy link
Contributor Author

Rebased.

@laanwj
Copy link
Member

laanwj commented Aug 31, 2016

Also compared binaries, tACK b175cb7

@laanwj laanwj merged commit b175cb7 into bitcoin:master Aug 31, 2016
laanwj added a commit that referenced this pull request Aug 31, 2016
b175cb7 Do not shadow variables. (Pavel Janík)
codablock pushed a commit to codablock/dash that referenced this pull request Jan 9, 2018
codablock pushed a commit to codablock/dash that referenced this pull request Jan 9, 2018
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
random-zebra added a commit to PIVX-Project/PIVX that referenced this pull request Nov 15, 2020
…refactor.

58504c2 [Wallet] refactor CWallet/CWalletDB/CDB (Round 2) (furszy)
c16390d [Wallet] refactor CWallet/CWalletDB/CDB (Round 1) (furszy)
99adac0 C++11: s/boost::scoped_ptr/std::unique_ptr/ (furszy)
815773e use constant references for strings in functions in wallet/*.* (furszy)
24f1041 Do not shadow variables. (Pavel Janík)
6a0c59a wallet: Warn on unexpected EOF while salvaging wallet (Wladimir J. van der Laan)
12bc297 dbwrapper: Use new .data() method of CDataStream (Wladimir J. van der Laan)
b0f0d91 streams: Remove special cases for ancient MSVC (Wladimir J. van der Laan)
ba96777 streams: Add data() method to CDataStream (Wladimir J. van der Laan)
6ec0722 wallet: Use CDataStream.data() (Wladimir J. van der Laan)
ca1a3b0 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)
fd259f3 remove unused classes from db.h (Philip Kaufmann)

Pull request description:

  Upgrading the wallet, wallet db and db wrapper areas with several back ports and updates adaptations.

  List of PRs:
  * dashpay#5933
  * bitcoin#7537
  * bitcoin#8191
  * bitcoin#8564
  * bitcoin#8574
  * bitcoin#8629
  * bitcoin#9353

  Note:
  Low priority PR, can be reviewing after merge Sapling and tier two PRs.
  I made it because we are pretty far from upstream in the db area and want to introduce some new functionality in the future that requires a more up-to-date db layer.

ACKs for top commit:
  random-zebra:
    ACK 58504c2 and merging...

Tree-SHA512: e5a700e855bcec20f0b74e41825ddc3a36b56a0cbe83212c93d212c06765254464999567b395584dfeb9d4b12999bc835d2e89949684d64b1503db36c53fd3c8
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants