Skip to content

Commit 6f09c0f

Browse files
committed
util: add missing braces and apply clang format to SplitHostPort()
1 parent 2875a76 commit 6f09c0f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/util/strencodings.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,20 @@ void SplitHostPort(std::string in, uint16_t& portOut, std::string& hostOut)
112112
size_t colon = in.find_last_of(':');
113113
// if a : is found, and it either follows a [...], or no other : is in the string, treat it as port separator
114114
bool fHaveColon = colon != in.npos;
115-
bool fBracketed = fHaveColon && (in[0]=='[' && in[colon-1]==']'); // if there is a colon, and in[0]=='[', colon is not 0, so in[colon-1] is safe
116-
bool fMultiColon = fHaveColon && (in.find_last_of(':',colon-1) != in.npos);
117-
if (fHaveColon && (colon==0 || fBracketed || !fMultiColon)) {
115+
bool fBracketed = fHaveColon && (in[0] == '[' && in[colon - 1] == ']'); // if there is a colon, and in[0]=='[', colon is not 0, so in[colon-1] is safe
116+
bool fMultiColon = fHaveColon && (in.find_last_of(':', colon - 1) != in.npos);
117+
if (fHaveColon && (colon == 0 || fBracketed || !fMultiColon)) {
118118
uint16_t n;
119119
if (ParseUInt16(in.substr(colon + 1), &n)) {
120120
in = in.substr(0, colon);
121121
portOut = n;
122122
}
123123
}
124-
if (in.size()>0 && in[0] == '[' && in[in.size()-1] == ']')
125-
hostOut = in.substr(1, in.size()-2);
126-
else
124+
if (in.size() > 0 && in[0] == '[' && in[in.size() - 1] == ']') {
125+
hostOut = in.substr(1, in.size() - 2);
126+
} else {
127127
hostOut = in;
128+
}
128129
}
129130

130131
std::string EncodeBase64(Span<const unsigned char> input)

0 commit comments

Comments
 (0)