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

Final removal of halloc. It's like Christmas Morning.

Browse Source
This commit is contained in:
ridiculousfish
2012-02-09 19:26:44 -08:00
parent a38490429b
commit 910863e9ea
23 changed files with 78 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wutil.cpp
View File

@@ -29,8 +29,6 @@
#include "common.h"
#include "wutil.h"
#include "halloc.h"
#include "halloc_util.h"
typedef std::string cstring;
@@ -337,27 +335,18 @@ const wchar_t *wgettext( const wchar_t *in )
return wres;
}
wchar_t *wgetenv( const wchar_t *name )
const wchar_t *wgetenv( const wchar_t *name )
{
ASSERT_IS_MAIN_THREAD();
cstring name_narrow = wcs2string(name);
char *res_narrow = getenv( name_narrow.c_str() );
static string_buffer_t *out = 0;
static wcstring out;
if( !res_narrow )
return 0;
if( !out )
{
out = sb_halloc( global_context );
}
else
{
sb_clear( out );
}
sb_printf( out, L"%s", res_narrow );
return (wchar_t *)out->buff;
out = format_string(L"%s", res_narrow);
return out.c_str();
}