diff options
| author |  Sadie Powell | 2025-03-22 17:09:07 +0000 |
|---|---|---|
| committer | Sadie Powell | 2025-03-22 17:13:01 +0000 |
| commit | afc6beb804e6414b392591edd65d69cdceb7cf1e (patch) | |
| tree | bfbe21b2600f3d01d023f4e7ad5e218f16eb7373 /src/configparser.cpp | |
| parent | Remove an obsolete ConvToStr overload. (diff) | |
Migrate configparser/configreader away from stringstream.
This is a very slow header to have included by every source file.
Diffstat (limited to 'src/configparser.cpp')
| -rw-r--r-- | src/configparser.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/configparser.cpp b/src/configparser.cpp index 7476fc061..af1785e23 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -182,8 +182,8 @@ struct Parser final break; else { - stack.errstr << "Invalid XML entity name in value of <" + tag->name + ":" + key + ">\n" - << "To include an ampersand or quote, use & or "\n"; + stack.errors.push_back(FMT::format("Invalid XML entity name in value of <{}:{}>", tag->name, key)); + stack.errors.push_back("To include an ampersand or quote, use & or ""); throw CoreException("Parse error"); } } @@ -319,7 +319,7 @@ struct Parser final break; case 0xFE: case 0xFF: - stack.errstr << "Do not save your files as UTF-16 or UTF-32, use UTF-8!\n"; + stack.errors.push_back("Do not save your files as UTF-16 or UTF-32, use UTF-8!"); [[fallthrough]]; default: throw CoreException("Syntax error - start of tag expected"); @@ -328,12 +328,11 @@ struct Parser final } catch (const CoreException& err) { - stack.errstr << err.GetReason() << " at " << current.str(); + stack.errors.push(FMT::format("{} at {}", err.GetReason(), current.str())); if (tag) - stack.errstr << " (inside <" << tag->name << "> tag on line " << tag->source.line << ")"; + stack.errors.back().append(FMT::format(" (inside {} tag on line {})", tag->name, tag->source.line)); else if (last_tag.line) - stack.errstr << " (last tag was on line " << last_tag.line << ")"; - stack.errstr << '\n'; + stack.errors.back().append(FMT::format(" (last tag was on line {})", tag->source.line)); } return false; } @@ -476,7 +475,7 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int ParseStack::ParseStack(ServerConfig* conf) : output(conf->config_data) , FilesOutput(conf->filesources) - , errstr(conf->errstr) + , errors(conf->errors) { vars = { // Special character escapes. |