Skip to content

backport: Merge bitcoin#30017, 29910, 29849, 29865 #7257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vijaydasmp wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

backport: Merge bitcoin#30017, 29910, 29849, 29865 #7257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c8be5c
Merge bitcoin/bitcoin#29849: Fix typos in `subprocess.hpp`
fanquake Apr 11, 2024
44faef9
Merge bitcoin/bitcoin#29910: refactor: Rename `subprocess.hpp` to fol…
fanquake Apr 24, 2024
38a5396
Merge bitcoin/bitcoin#30017: refactor, fuzz: Make 64-bit shift explicit
fanquake May 3, 2024
1db9caa
Merge bitcoin/bitcoin#29865: util: remove unused cpp-subprocess options
achow101 Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ BITCOIN_CORE_H = \
util/spanparsing.h \
util/std23.h \
util/string.h \
util/subprocess.hpp \
util/subprocess.h \
util/syserror.h \
util/system.h \
util/thread.h \
Expand Down
2 changes: 1 addition & 1 deletion src/common/run_command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <univalue.h>

#ifdef ENABLE_EXTERNAL_SIGNER
#include <util/subprocess.hpp>
#include <util/subprocess.h>
#endif // ENABLE_EXTERNAL_SIGNER

UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
Expand Down
4 changes: 2 additions & 2 deletions src/test/fuzz/poolresource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ class PoolResourceFuzzer
{
if (m_total_allocated > 0x1000000) return;
size_t alignment_bits = m_provider.ConsumeIntegralInRange<size_t>(0, 7);
size_t alignment = 1 << alignment_bits;
size_t alignment = size_t{1} << alignment_bits;
size_t size_bits = m_provider.ConsumeIntegralInRange<size_t>(0, 16 - alignment_bits);
size_t size = m_provider.ConsumeIntegralInRange<size_t>(1U << size_bits, (1U << (size_bits + 1)) - 1U) << alignment_bits;
size_t size = m_provider.ConsumeIntegralInRange<size_t>(size_t{1} << size_bits, (size_t{1} << (size_bits + 1)) - 1U) << alignment_bits;
Allocate(size, alignment);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/system_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <univalue.h>

#ifdef ENABLE_EXTERNAL_SIGNER
#include <util/subprocess.hpp>
#include <util/subprocess.h>
#endif // ENABLE_EXTERNAL_SIGNER

#include <boost/test/unit_test.hpp>
Expand Down
Loading