github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Removed an optimization obviated by our use of wcstring from env.cpp

Browse Source
This commit is contained in:
ridiculousfish 2012-02-21 18:12:51 -08:00
parent 4ccc197451
commit 5f3fe4acff
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
env.cpp
View File

@ -85,16 +85,13 @@ extern char **__environ;
should be exported. Obviously, it needs to be allocated large should be exported. Obviously, it needs to be allocated large
enough to fit the value string. enough to fit the value string.
*/ */
typedef struct var_entry struct var_entry_t
{ {
int exportv; /**< Whether the variable should be exported */ bool exportv; /**< Whether the variable should be exported */
size_t size; /**< The maximum length (excluding the NULL) that will fit into this var_entry_t */
wcstring val; /**< The value of the variable */ wcstring val; /**< The value of the variable */
var_entry():exportv(0), size(0){ } var_entry_t() : exportv(false) { }
} };
var_entry_t;
/** /**
@ -899,7 +896,6 @@ int env_set( const wchar_t *key,
if( !done ) if( !done )
{ {
var_entry_t *old_entry = NULL; var_entry_t *old_entry = NULL;
size_t val_len = wcslen(val);
std::map<wcstring, var_entry_t*>::iterator result = node->env.find(key); std::map<wcstring, var_entry_t*>::iterator result = node->env.find(key);
if ( result != node->env.end() ) if ( result != node->env.end() )
{ {
@ -908,11 +904,11 @@ int env_set( const wchar_t *key,
} }
var_entry_t *entry = NULL; var_entry_t *entry = NULL;
if( old_entry && old_entry->size >= val_len ) if( old_entry )
{ {
entry = old_entry; entry = old_entry;
if( !!(var_mode & ENV_EXPORT) || entry->exportv ) if( (var_mode & ENV_EXPORT) || entry->exportv )
{ {
entry->exportv = !!(var_mode & ENV_EXPORT); entry->exportv = !!(var_mode & ENV_EXPORT);
has_changed_new = 1; has_changed_new = 1;
@ -920,17 +916,8 @@ int env_set( const wchar_t *key,
} }
else else
{ {
if (old_entry != NULL) entry = new var_entry_t;
delete old_entry;
entry = new var_entry_t;
if( !entry )
{
DIE_MEM();
}
entry->size = val_len;
if( var_mode & ENV_EXPORT) if( var_mode & ENV_EXPORT)
{ {
entry->exportv = 1; entry->exportv = 1;