github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-21 02:54:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

unusued find_entry member: use it

Browse Source 
Assuming this was meant to be used when created, simplify
two other spots to make use of find_entry().
This commit is contained in:
Aaron Gyes 2021-12-24 18:39:32 -08:00
parent 4efb1b1644
commit 29ccc08a53
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/env.cpp
View File

@ -765,23 +765,15 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key) cons
}
maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key) const {
auto cursor = locals_;
while (cursor) {
auto where = cursor->env.find(key);
if (where != cursor->env.end()) {
return where->second;
}
cursor = cursor->next;
maybe_t<env_var_t> entry;
for (auto cur = locals_; cur; cur=cur->next) {
if ((entry = cur->find_entry(key))) break;
}
return none();
return entry; // this is either the entry or none() from find_entry
}
maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key) const {
auto where = globals_->env.find(key);
if (where != globals_->env.end()) {
return where->second;
}
return none();
return globals_->find_entry(key);
}
maybe_t<env_var_t> env_scoped_impl_t::try_get_universal(const wcstring &key) const {