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

Straighten out some wchar_t** casts

Browse Source 
Embrace the fact that builtins expect to modify their argv array and get rid
of a bunch of const.
This commit is contained in:
ridiculousfish
2018-08-04 16:15:06 -07:00
parent 5eada4b623
commit acff2516d4
7 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/builtin_function.cpp
View File

@@ -212,9 +212,8 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
wcstring_list_t args = {L"function"};
args.insert(args.end(), c_args.begin(), c_args.end());
// Hackish const_cast matches the one in builtin_run.
const null_terminated_array_t<wchar_t> argv_array(args);
wchar_t **argv = const_cast<wchar_t **>(argv_array.get());
null_terminated_array_t<wchar_t> argv_array(args);
wchar_t **argv = argv_array.get();
wchar_t *cmd = argv[0];
int argc = builtin_count_args(argv);