Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#25888: refactor: use strprintf for creating u…
Browse files Browse the repository at this point in the history
…nknown-service-flag string

706c8e0 refactor: use `strprintf` for creating unknown-service-flag string (Sebastian Falbesoner)

Pull request description:

  No need to use a stringstream here. The trivial change can be verified by running the functional test `rpc_net.py`:
  https://github.com/bitcoin/bitcoin/blob/c73c8d53fe27956faacb3e8ca0e94adf071de6ec/test/functional/rpc_net.py#L181-L184
  As far as I could tell, this is the only instace left where we used `std::ostringstream` for the creation of simple strings (in `FormatSubVersion` using a stream makes sense since the number of placeholders is not constant).

ACKs for top commit:
  kristapsk:
    ACK 706c8e0

Tree-SHA512: 069cea29aef03996ae16a0dc3ed87b1b2cf2ab0bf5987c225b10da12d0f4b62b7c3faf3a169c0b912eb2ad60c6ea0a09a622be7eaadad78cee0463ef4ffc0e19
  • Loading branch information
MacroFake committed Aug 22, 2022
2 parents c73c8d5 + 706c8e0 commit 027b672
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/protocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,7 @@ static std::string serviceFlagToStr(size_t bit)
// Not using default, so we get warned when a case is missing
}

std::ostringstream stream;
stream.imbue(std::locale::classic());
stream << "UNKNOWN[";
stream << "2^" << bit;
stream << "]";
return stream.str();
return strprintf("UNKNOWN[2^%u]", bit);
}

std::vector<std::string> serviceFlagsToStr(uint64_t flags)
Expand Down

0 comments on commit 027b672

Please sign in to comment.