mirror of
https://github.com/fmtlib/fmt.git
synced 2024-12-26 00:21:13 +00:00
Only append terminating '\0' when necessary.
This commit is contained in:
parent
430c45d618
commit
f43de4a469
12
format.h
12
format.h
@ -1287,13 +1287,12 @@ class FormatInt {
|
|||||||
// Buffer should be large enough to hold all digits (digits10 + 1),
|
// Buffer should be large enough to hold all digits (digits10 + 1),
|
||||||
// a sign and a null character.
|
// a sign and a null character.
|
||||||
enum {BUFFER_SIZE = std::numeric_limits<unsigned long long>::digits10 + 3};
|
enum {BUFFER_SIZE = std::numeric_limits<unsigned long long>::digits10 + 3};
|
||||||
char buffer_[BUFFER_SIZE];
|
mutable char buffer_[BUFFER_SIZE];
|
||||||
char *str_;
|
char *str_;
|
||||||
|
|
||||||
// Formats value in reverse and returns the number of digits.
|
// Formats value in reverse and returns the number of digits.
|
||||||
char *FormatDecimal(unsigned long long value) {
|
char *FormatDecimal(unsigned long long value) {
|
||||||
char *buffer_end = buffer_ + BUFFER_SIZE;
|
char *buffer_end = buffer_ + BUFFER_SIZE - 1;
|
||||||
*--buffer_end = '\0';
|
|
||||||
while (value >= 100) {
|
while (value >= 100) {
|
||||||
// Integer division is slow so do it for a group of two digits instead
|
// Integer division is slow so do it for a group of two digits instead
|
||||||
// of for every digit. The idea comes from the talk by Alexandrescu
|
// of for every digit. The idea comes from the talk by Alexandrescu
|
||||||
@ -1331,8 +1330,11 @@ class FormatInt {
|
|||||||
explicit FormatInt(unsigned long value) : str_(FormatDecimal(value)) {}
|
explicit FormatInt(unsigned long value) : str_(FormatDecimal(value)) {}
|
||||||
explicit FormatInt(unsigned long long value) : str_(FormatDecimal(value)) {}
|
explicit FormatInt(unsigned long long value) : str_(FormatDecimal(value)) {}
|
||||||
|
|
||||||
const char *c_str() const { return str_; }
|
const char *c_str() const {
|
||||||
std::string str() const { return str_; }
|
buffer_[BUFFER_SIZE - 1] = '\0';
|
||||||
|
return str_;
|
||||||
|
}
|
||||||
|
std::string str() const { return std::string(str_, size()); }
|
||||||
std::size_t size() const { return buffer_ - str_ + BUFFER_SIZE - 1; }
|
std::size_t size() const { return buffer_ - str_ + BUFFER_SIZE - 1; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user