dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: let ReadLine return a string instead of passing a buffer

Browse Source
This commit is contained in:
Rubidium
2023-06-09 18:10:24 +02:00
committed by rubidium42
parent 81f957b9f8
commit 6d597879d0
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/strgen/strgen_base.cpp
View File

@@ -739,16 +739,13 @@ void StringReader::HandlePragma(char *str)
}
}
static void rstrip(char *buf)
static void StripTrailingWhitespace(std::string &str)
{
size_t i = strlen(buf);
while (i > 0 && (buf[i - 1] == '\r' || buf[i - 1] == '\n' || buf[i - 1] == ' ')) i--;
buf[i] = '\0';
str.erase(str.find_last_not_of("\r\n ") + 1);
}
void StringReader::ParseFile()
{
char buf[2048];
_warnings = _errors = 0;
_translation = this->translation;
@@ -765,9 +762,12 @@ void StringReader::ParseFile()
strecpy(_lang.digit_decimal_separator, ".", lastof(_lang.digit_decimal_separator));
_cur_line = 1;
while (this->data.next_string_id < this->data.max_strings && this->ReadLine(buf, lastof(buf)) != nullptr) {
rstrip(buf);
this->HandleString(buf);
while (this->data.next_string_id < this->data.max_strings) {
std::optional<std::string> line = this->ReadLine();
if (!line.has_value()) return;
StripTrailingWhitespace(line.value());
this->HandleString(line.value().data());
_cur_line++;
}