Skip to content

Commit ff438a1

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#21996: p2p: pass strings to NetPermissions::TryParse functions by const ref
3939347 p2p: pass strings to NetPermissions::TryParse functions by const ref (Jon Atack) Pull request description: instead of by value, as these are "in" params that are not cheap to copy. Reference: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#f16-for-in-parameters-pass-cheaply-copied-types-by-value-and-others-by-reference-to-const ACKs for top commit: MarcoFalke: cr ACK 3939347 Tree-SHA512: 294fe0f2d900293b4447d4e1f0ccc60c1ed27b3bdbd0f5d71d3dbf71de86879638b1b813fadfb44c58b4acff4e7d75b7ed6a4f9cc5fcf627108224e6a21b524c
2 parents d4c409c + 3939347 commit ff438a1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/net_permissions.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const std::vector<std::string> NET_PERMISSIONS_DOC{
2020

2121
namespace {
2222

23-
// The parse the following format "perm1,perm2@xxxxxx"
24-
bool TryParsePermissionFlags(const std::string str, NetPermissionFlags& output, size_t& readen, bilingual_str& error)
23+
// Parse the following format: "perm1,perm2@xxxxxx"
24+
bool TryParsePermissionFlags(const std::string& str, NetPermissionFlags& output, size_t& readen, bilingual_str& error)
2525
{
2626
NetPermissionFlags flags = NetPermissionFlags::None;
2727
const auto atSeparator = str.find('@');
@@ -81,7 +81,7 @@ std::vector<std::string> NetPermissions::ToStrings(NetPermissionFlags flags)
8181
return strings;
8282
}
8383

84-
bool NetWhitebindPermissions::TryParse(const std::string str, NetWhitebindPermissions& output, bilingual_str& error)
84+
bool NetWhitebindPermissions::TryParse(const std::string& str, NetWhitebindPermissions& output, bilingual_str& error)
8585
{
8686
NetPermissionFlags flags;
8787
size_t offset;
@@ -104,7 +104,7 @@ bool NetWhitebindPermissions::TryParse(const std::string str, NetWhitebindPermis
104104
return true;
105105
}
106106

107-
bool NetWhitelistPermissions::TryParse(const std::string str, NetWhitelistPermissions& output, bilingual_str& error)
107+
bool NetWhitelistPermissions::TryParse(const std::string& str, NetWhitelistPermissions& output, bilingual_str& error)
108108
{
109109
NetPermissionFlags flags;
110110
size_t offset;

src/net_permissions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ class NetPermissions
7474
class NetWhitebindPermissions : public NetPermissions
7575
{
7676
public:
77-
static bool TryParse(const std::string str, NetWhitebindPermissions& output, bilingual_str& error);
77+
static bool TryParse(const std::string& str, NetWhitebindPermissions& output, bilingual_str& error);
7878
CService m_service;
7979
};
8080

8181
class NetWhitelistPermissions : public NetPermissions
8282
{
8383
public:
84-
static bool TryParse(const std::string str, NetWhitelistPermissions& output, bilingual_str& error);
84+
static bool TryParse(const std::string& str, NetWhitelistPermissions& output, bilingual_str& error);
8585
CSubNet m_subnet;
8686
};
8787

0 commit comments

Comments
 (0)