Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 05:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

env: Use preexisting_flags to determine pathiness

Browse source 
We've already checked if the variable exists above, and we've already
gotten the preexisting_flags, so we can just use them.

Saves a lookup.
This commit is contained in:
Fabian Homborg 2018-11-04 17:02:04 +01:00
parent 9afc4b419e
commit a7ec158373
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.cpp
View file

@ -1147,8 +1147,8 @@ static int env_set_internal(const wcstring &key, env_mode_flags_t input_var_mode
// If there's an existing variable, use its path flag; otherwise infer it. // If there's an existing variable, use its path flag; otherwise infer it.
if ((var_mode & (ENV_PATHVAR | ENV_UNPATHVAR)) == 0) { if ((var_mode & (ENV_PATHVAR | ENV_UNPATHVAR)) == 0) {
bool should_pathvar = false; bool should_pathvar = false;
if (auto existing = node->find_entry(key)) { if (preexisting_flags) {
should_pathvar = existing->is_pathvar(); should_pathvar = *preexisting_flags & env_var_t::flag_pathvar;
} else { } else {
should_pathvar = variable_should_auto_pathvar(key); should_pathvar = variable_should_auto_pathvar(key);
} }