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

Yet more un-hallocing

Browse Source
This commit is contained in:
ridiculousfish
2012-01-30 02:23:58 -08:00
parent 316f81119f
commit 79e0405f6a
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
expand.cpp
View File

@@ -2585,7 +2585,7 @@ int expand_string( void *context,
}
*/
wchar_t *expand_one( void *context, wchar_t *string, int flags )
wchar_t *expand_one( void *context, const wchar_t *string, int flags )
{
std::vector<completion_t> l;
int res;
@@ -2595,8 +2595,8 @@ wchar_t *expand_one( void *context, wchar_t *string, int flags )
if( (!(flags & ACCEPT_INCOMPLETE)) && expand_is_clean( string ) )
{
halloc_register( context, string );
return string;
halloc_register( context, (void *)string );
return (wchar_t *)string;
}
// al_init( &l );
@@ -2625,5 +2625,17 @@ wchar_t *expand_one( void *context, wchar_t *string, int flags )
halloc_register( context, one );
return one;
}
bool expand_one( wcstring &in, int flag ) {
bool result = false;
wchar_t *res = expand_one(NULL, in.c_str(), flag);
if (res) {
in = res;
free(res);
result = true;
}
return result;
}