From 27ec8f41ba396cfb1fe2219e3c722f3a08f4c97b Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 24 Sep 2022 17:47:52 +0000 Subject: [PATCH] Pass std::span to con_add_buffer_line --- similar/main/console.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/similar/main/console.cpp b/similar/main/console.cpp index 27a959c29..70759d453 100644 --- a/similar/main/console.cpp +++ b/similar/main/console.cpp @@ -78,16 +78,16 @@ static con_state con_state; static int con_scroll_offset, con_size; static void con_force_puts(con_priority priority, char *buffer, size_t len); -static void con_add_buffer_line(const con_priority priority, const char *const buffer, const size_t len) +static void con_add_buffer_line(const con_priority priority, const std::span buffer) { /* shift con_buffer for one line */ std::move(std::next(con_buffer.begin()), con_buffer.end(), con_buffer.begin()); console_buffer &c = con_buffer.back(); c.priority=priority; - size_t copy = std::min(len, std::size(c.line) - 1); + const std::size_t copy = std::min(buffer.size(), std::size(c.line) - 1); c.line[copy] = 0; - memcpy(&c.line,buffer, copy); + memcpy(&c.line, buffer.data(), copy); } } @@ -234,7 +234,7 @@ static void con_print_file(const char *const buffer) */ static void con_force_puts(const con_priority priority, char *const buffer, const size_t len) { - con_add_buffer_line(priority, buffer, len); + con_add_buffer_line(priority, std::span(buffer, len)); con_scrub_markup(buffer); /* Produce a sanitised version and send it to the console */ con_print_file(buffer); @@ -259,7 +259,7 @@ void con_puts(const con_priority_wrapper priority, const char *const buffer, con typename con_priority_wrapper::scratch_buffer scratch_buffer; auto &&b = priority.prepare_buffer(scratch_buffer, buffer, len); /* add given string to con_buffer */ - con_add_buffer_line(priority, b.data(), b.size()); + con_add_buffer_line(priority, b); con_print_file(b.data()); } }