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

Eliminate the 'global' var_table_t variable in env.cpp

Browse source 
This can always be trivially found from 'global_env'
This commit is contained in:
ridiculousfish 2017-01-26 10:32:31 -08:00
parent dddb0bb24b
commit afe54df843
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/env.cpp
View file

@ -102,9 +102,6 @@ static env_universal_t *s_universal_variables = NULL;
/// Getter for universal variables. /// Getter for universal variables.
static env_universal_t *uvars() { return s_universal_variables; } static env_universal_t *uvars() { return s_universal_variables; }
/// Table for global variables.
static var_table_t *global;
// Helper class for storing constant strings, without needing to wrap them in a wcstring. // Helper class for storing constant strings, without needing to wrap them in a wcstring.
// Comparer for const string set. // Comparer for const string set.
@ -426,7 +423,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
top = new env_node_t; top = new env_node_t;
global_env = top; global_env = top;
global = &top->env;
// Now the environment variable handling is set up, the next step is to insert valid data. // Now the environment variable handling is set up, the next step is to insert valid data.
@ -950,7 +946,7 @@ void env_push(bool new_scope) {
} }
void env_pop() { void env_pop() {
if (&top->env != global) { if (top != global_env) {
int i; int i;
const wchar_t *locale_changed = NULL; const wchar_t *locale_changed = NULL;
env_node_t *killme = top; env_node_t *killme = top;