Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-16 06:54:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify history_output_buffer_t

Browse source
This commit is contained in:
ridiculousfish 2019-08-11 13:07:47 -07:00
parent 2ddde381d4
commit 92e9a34b47
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/history.cpp
View file

@ -76,12 +76,11 @@ static constexpr int max_save_tries = 1024;
namespace { namespace {
static size_t safe_strlen(const char *s) { return s ? std::strlen(s) : 0; }
/// Helper class for certain output. This is basically a string that allows us to ensure we only /// Helper class for certain output. This is basically a string that allows us to ensure we only
/// flush at record boundaries, and avoids the copying of ostringstream. Have you ever tried to /// flush at record boundaries, and avoids the copying of ostringstream. Have you ever tried to
/// implement your own streambuf? Total insanity. /// implement your own streambuf? Total insanity.
class history_output_buffer_t { class history_output_buffer_t {
std::vector<char> buffer; std::string buffer;
public: public:
/// Add a bit more to HISTORY_OUTPUT_BUFFER_SIZE because we flush once we've exceeded that size. /// Add a bit more to HISTORY_OUTPUT_BUFFER_SIZE because we flush once we've exceeded that size.
@ -91,20 +90,9 @@ class history_output_buffer_t {
/// Append one or more strings. /// Append one or more strings.
void append(const char *s1, const char *s2 = NULL, const char *s3 = NULL) { void append(const char *s1, const char *s2 = NULL, const char *s3 = NULL) {
constexpr size_t ptr_count = 3; if (s1) buffer.append(s1);
const char *ptrs[ptr_count] = {s1, s2, s3}; if (s2) buffer.append(s2);
size_t lengths[ptr_count] = {safe_strlen(s1), safe_strlen(s2), safe_strlen(s3)}; if (s3) buffer.append(s3);
// Determine the additional size we'll need.
size_t additional_length = std::accumulate(std::begin(lengths), std::end(lengths), 0);
buffer.reserve(buffer.size() + additional_length);
// Append
for (size_t i = 0; i < ptr_count; i++) {
if (lengths[i] > 0) {
buffer.insert(buffer.end(), ptrs[i], ptrs[i] + lengths[i]);
}
}
} }
/// Output to a given fd, resetting our buffer. Returns true on success, false on error. /// Output to a given fd, resetting our buffer. Returns true on success, false on error.
@ -112,7 +100,7 @@ class history_output_buffer_t {
if (buffer.empty()) { if (buffer.empty()) {
return true; return true;
} }
bool result = write_loop(fd, &buffer.at(0), buffer.size()) >= 0; bool result = write_loop(fd, buffer.data(), buffer.size()) >= 0;
buffer.clear(); buffer.clear();
return result; return result;
} }