github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 03:50:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

input: Remove useless .c_str

Browse Source 
(Also removes some dead code)
This commit is contained in:
Fabian Homborg 2019-02-06 23:45:14 +01:00
parent 988283c717
commit 87e71bcde7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input.cpp
View File

@ -176,7 +176,7 @@ void input_set_bind_mode(const wcstring &bm) {
ASSERT_IS_MAIN_THREAD();
auto &vars = parser_t::principal_parser().vars();
assert(!bm.empty());
if (input_get_bind_mode(vars) != bm.c_str()) {
if (input_get_bind_mode(vars) != bm) {
vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, bm);
}
}
@ -224,10 +224,6 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands,
CHECK(mode, );
CHECK(sets_mode, );
// debug( 0, L"Add mapping from %ls to %ls in mode %ls", escape_string(sequence,
// ESCAPE_ALL).c_str(),
// escape_string(command, ESCAPE_ALL).c_str(), mode);
// Remove existing mappings with this sequence.
const wcstring_list_t commands_vector(commands, commands + commands_len);
@ -372,7 +368,7 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
// see that until all other commands have also been run.
int last_status = proc_get_last_status();
for (const wcstring &cmd : m.commands) {
parser_t::principal_parser().eval(cmd.c_str(), io_chain_t(), TOP);
parser_t::principal_parser().eval(cmd, io_chain_t(), TOP);
}
proc_set_last_status(last_status);
input_common_next_ch(R_NULL);