github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 03:54:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some assignments of wcs2string to references

Browse Source 
wcs2string returns a std::string by value; it should not be assigned to a
reference variable.
This commit is contained in:
ridiculousfish 2021-05-21 13:09:28 -07:00
parent 9928404920
commit 9d696ba7d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/env_dispatch.cpp
View File

@ -139,7 +139,7 @@ static void handle_timezone(const wchar_t *env_var_name, const environment_t &va
const auto var = vars.get(env_var_name, ENV_DEFAULT);
FLOGF(env_dispatch, L"handle_timezone() current timezone var: |%ls| => |%ls|", env_var_name,
!var ? L"MISSING" : var->as_string().c_str());
const std::string &name = wcs2string(env_var_name);
std::string name = wcs2string(env_var_name);
if (var.missing_or_empty()) {
unsetenv_lock(name.c_str());
} else {
@ -539,7 +539,7 @@ static void init_locale(const environment_t &vars) {
for (const auto &var_name : locale_variables) {
const auto var = vars.get(var_name, ENV_EXPORT);
const std::string &name = wcs2string(var_name);
std::string name = wcs2string(var_name);
if (var.missing_or_empty()) {
FLOGF(env_locale, L"locale var %s missing or empty", name.c_str());
unsetenv_lock(name.c_str());