h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 19:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Teach env_universal_remove to directly report whether the variable was

Browse Source 
successfully removed.
This commit is contained in:
ridiculousfish
2014-06-13 15:15:11 -07:00
parent 17c2d76c5e
commit 735195e8ea
5 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
env_universal_common.cpp
View File

@@ -113,9 +113,9 @@ void env_universal_common_init(void (*cb)(fish_message_type_t type, const wchar_
/**
Remove variable with specified name
*/
void env_universal_common_remove(const wcstring &name)
bool env_universal_common_remove(const wcstring &name)
{
default_universal_vars().remove(name);
return default_universal_vars().remove(name);
}
/**
@@ -359,25 +359,21 @@ void env_universal_t::set(const wcstring &key, const wcstring &val, bool exportv
this->set_internal(key, val, exportv, true /* overwrite */);
}
void env_universal_t::remove_internal(const wcstring &key, bool overwrite)
bool env_universal_t::remove_internal(const wcstring &key)
{
ASSERT_IS_LOCKED(lock);
if (! overwrite && this->modified.find(key) != modified.end())
{
/* This value has been modified and we're not overwriting it. Skip it. */
return;
}
size_t erased = this->vars.erase(key);
if (erased > 0 && overwrite)
if (erased > 0)
{
this->modified.insert(key);
}
return erased > 0;
}
void env_universal_t::remove(const wcstring &key)
bool env_universal_t::remove(const wcstring &key)
{
scoped_lock locker(lock);
this->remove_internal(key, true);
return this->remove_internal(key);
}
wcstring_list_t env_universal_t::get_names(bool show_exported, bool show_unexported) const