Most of the code in util/system.cpp that was hardcoded to use the global ArgsManager instance gArgs has been changed to stop using it (for example in #20092). But a few hardcoded references to gArgs remain. This commit removes the last ones so these functions aren’t reading or writing global state.
Noticed these gArgs references while reviewing #27073
New function was introduced by willcl-ark <will@256k1.dev> in commit
56e370fbb9413260723c598048392219b1055ad0 from
https://github.com/bitcoin/bitcoin/pull/27073 and removes some duplicate code.
Most of the code in util/system.cpp that was hardcoded to use the global
ArgsManager instance `gArgs` has been changed to work with explicit ArgsManager
instances (for example in https://github.com/bitcoin/bitcoin/pull/20092). But a
few hardcoded references to `gArgs` remain. This commit removes the last ones
so these functions aren't reading or writing global state.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | willcl-ark, stickies-v, achow101 |
| Concept ACK | TheCharlatan, fanquake, hebasto |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
tACK 9a9d5da11
Tidy changes to remove the last references to global gArgs from util/system.cpp (besides the global declaration).
1067@@ -1068,8 +1068,8 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
1068 }
1069
1070 // If datadir is changed in .conf file:
1071- gArgs.ClearPathCache();
gArgs regardless of this PR, perhaps useful to split out in separate commit? In the 3 callsites of ArgsManager::ReadConfigFiles I see, it is only called on gArgs anyway, so I don’t see any actual behaviour change/potential bug because of it.
