diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2012-05-09 03:06:10 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-05-09 03:06:10 -0700 |
commit | 175249b4555afd7e453d5bd5a054bb79f3577fe1 (patch) | |
tree | c2002dfc8e186dfab1cbc3315e82d0f33ebed913 /env_universal.cpp | |
parent | 294fbc830918f49dd13500bdf0fb4f4933338023 (diff) |
Adopt wcstring in env_set
Diffstat (limited to 'env_universal.cpp')
-rw-r--r-- | env_universal.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/env_universal.cpp b/env_universal.cpp index e9b0d0d8..3d12a222 100644 --- a/env_universal.cpp +++ b/env_universal.cpp @@ -326,12 +326,10 @@ wchar_t *env_universal_get( const wcstring &name ) return env_universal_common_get( name ); } -int env_universal_get_export( const wchar_t *name ) +int env_universal_get_export( const wcstring &name ) { if( !init) return 0; - - CHECK( name, 0 ); return env_universal_common_get_export( name ); } @@ -399,26 +397,24 @@ void env_universal_barrier() } -void env_universal_set( const wchar_t *name, const wchar_t *value, int exportv ) +void env_universal_set( const wcstring &name, const wcstring &value, int exportv ) { message_t *msg; if( !init ) return; - CHECK( name, ); - - debug( 3, L"env_universal_set( \"%ls\", \"%ls\" )", name, value ); + debug( 3, L"env_universal_set( \"%ls\", \"%ls\" )", name.c_str(), value.c_str() ); if( is_dead() ) { - env_universal_common_set( name, value, exportv ); + env_universal_common_set( name.c_str(), value.c_str(), exportv ); } else { msg = create_message( exportv?SET_EXPORT:SET, - name, - value); + name.c_str(), + value.c_str()); if( !msg ) { |