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

Remove unnecessary "string_set_contains" function

Browse Source
This commit is contained in:
Fabian Homborg
2018-11-01 20:53:49 +01:00
parent dfcf140e00
commit 1836e704c4
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/env.cpp
View File

@@ -286,19 +286,11 @@ static env_universal_t *uvars() { return s_universal_variables; }
// so we don't bother to sort them.
using string_set_t = const wchar_t *const[];
template <typename T>
bool string_set_contains(const T &set, const wchar_t *val) {
for (const wchar_t *entry : set) {
if (!wcscmp(val, entry)) return true;
}
return false;
}
/// Check if a variable may not be set using the set command.
static bool is_read_only(const wchar_t *val) {
const string_set_t env_read_only = {L"PWD", L"SHLVL", L"history", L"status", L"version",
L"fish_pid", L"hostname", L"_", L"fish_private_mode"};
return string_set_contains(env_read_only, val) ||
return contains(env_read_only, val) ||
(in_private_mode() && wcscmp(L"fish_history", val) == 0);
}