diff options
author | Hop311 <Hop3114@gmail.com> | 2024-01-22 22:04:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-22 22:04:25 +0100 |
commit | 4f4a053dff51fe28e473ac8b3528a95dc6e5dec6 (patch) | |
tree | b22e63b6e247179df4069df8a0f902ed40a3471e /src/openvic-dataloader/detail/Warnings.hpp | |
parent | 59ec8275b584d4a48f7836816114d4933c655799 (diff) | |
parent | afbd8024110aaa80a7b94cff9a9d96e763b13916 (diff) |
Merge pull request #36 from OpenVicProject/fix/file-path-memory
Fixed BasicParser::_file_path relying on externally controlled memory
Diffstat (limited to 'src/openvic-dataloader/detail/Warnings.hpp')
-rw-r--r-- | src/openvic-dataloader/detail/Warnings.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/openvic-dataloader/detail/Warnings.hpp b/src/openvic-dataloader/detail/Warnings.hpp index 6c0b34e..8fc09bd 100644 --- a/src/openvic-dataloader/detail/Warnings.hpp +++ b/src/openvic-dataloader/detail/Warnings.hpp @@ -1,13 +1,15 @@ #pragma once -#include <openvic-dataloader/v2script/Parser.hpp> +#include <string_view> + +#include <openvic-dataloader/ParseWarning.hpp> namespace ovdl::v2script::warnings { - inline const ParseWarning make_utf8_warning(const char* file_path) { + inline const ParseWarning make_utf8_warning(std::string_view file_path) { constexpr std::string_view message_suffix = "This may cause problems. Prefer Windows-1252 encoding."; std::string message; - if (!file_path) { + if (file_path.empty()) { message = "Buffer is a UTF-8 encoded string. " + std::string(message_suffix); } else { message = "File '" + std::string(file_path) + "' is a UTF-8 encoded file. " + std::string(message_suffix); |