diff options
author | npwoods <npwoods@mess.org> | 2022-06-15 06:57:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-15 20:57:23 +1000 |
commit | 699630ed167692e6d8d953caadd228bbd87c19aa (patch) | |
tree | 3b85ee6f8ceb4bcc5e97419206bb89200185faf4 /src/osd/windows/winutil.cpp | |
parent | fe1e26a9fb437de24661a5cb16f82ec94cdb14fc (diff) |
osdcore.h: Changed osd_subst_env to accept a std::string_view and return a std::string. (#9928)
Diffstat (limited to '')
-rw-r--r-- | src/osd/windows/winutil.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/osd/windows/winutil.cpp b/src/osd/windows/winutil.cpp index 7d790949178..3a344386a12 100644 --- a/src/osd/windows/winutil.cpp +++ b/src/osd/windows/winutil.cpp @@ -101,7 +101,7 @@ BOOL win_is_gui_application() //============================================================ // osd_subst_env //============================================================ -void osd_subst_env(std::string &dst, const std::string &src) +std::string osd_subst_env(std::string_view src) { std::wstring const w_src = osd::text::to_wstring(src); std::vector<wchar_t> buffer(w_src.size() + 2); @@ -112,10 +112,11 @@ void osd_subst_env(std::string &dst, const std::string &src) buffer.resize(length + 1); length = ExpandEnvironmentStringsW(w_src.c_str(), &buffer[0], buffer.size()); } + + std::string dst; if (length) osd::text::from_wstring(dst, &buffer[0]); - else - dst.clear(); + return dst; } //------------------------------------------------- |