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

Migrate some more away from array_list_t

Browse Source
This commit is contained in:
ridiculousfish
2011-12-28 12:36:47 -08:00
parent 46fa2dd2f0
commit 78322a6321
5 changed files with 48 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
env.cpp
View File

@@ -1678,7 +1678,6 @@ char **env_export_arr( int recalc )
if( has_changed )
{
array_list_t uni;
hash_table_t vals;
int prev_was_null=1;
int pos=0;
@@ -1690,16 +1689,15 @@ char **env_export_arr( int recalc )
get_exported( top, &vals );
al_init( &uni );
env_universal_get_names( &uni, 1, 0 );
for( i=0; i<al_get_count( &uni ); i++ )
wcstring_list_t uni;
env_universal_get_names2( uni, 1, 0 );
for( i=0; i<uni.size(); i++ )
{
wchar_t *key = (wchar_t *)al_get( &uni, i );
wchar_t *val = env_universal_get( key );
const wchar_t *key = uni.at(i).c_str();
const wchar_t *val = env_universal_get( key );
if( wcscmp( val, ENV_NULL) && !hash_get( &vals, key ) )
hash_put( &vals, key, val );
}
al_destroy( &uni );
export_buffer.used=0;