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

Work towards getting function.h off of shared_ptr

Browse Source
This commit is contained in:
ridiculousfish
2012-05-17 19:37:46 -07:00
parent 977c585f8b
commit 86645b32e1
9 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wildcard.cpp
View File

@@ -204,7 +204,7 @@ static bool wildcard_complete_internal(const wcstring &orig,
const wchar_t *wc,
bool is_first,
const wchar_t *desc,
const wchar_t *(*desc_func)(const wcstring &),
wcstring (*desc_func)(const wcstring &),
std::vector<completion_t> &out,
int flags )
{
@@ -245,8 +245,8 @@ static bool wildcard_complete_internal(const wcstring &orig,
it. If it returns something, use that as the
description.
*/
const wchar_t *func_desc = desc_func( orig );
if( func_desc )
wcstring func_desc = desc_func( orig );
if (! func_desc.empty())
out_desc = func_desc;
}
@@ -300,7 +300,7 @@ static bool wildcard_complete_internal(const wcstring &orig,
bool wildcard_complete(const wcstring &str,
const wchar_t *wc,
const wchar_t *desc,
const wchar_t *(*desc_func)(const wcstring &),
wcstring (*desc_func)(const wcstring &),
std::vector<completion_t> &out,
int flags )
{