Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a duplicated variable, and defeat some warnings in fish_tests

Browse source
This commit is contained in:
ridiculousfish 2014-04-27 18:44:21 -07:00
parent 4948508277
commit 97c2ec8dcf
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fish_tests.cpp
View file

@ -2012,8 +2012,8 @@ static void test_autosuggest_suggest_special()
// A single quote should defeat tilde expansion // A single quote should defeat tilde expansion
perform_one_autosuggestion_test(L"cd '~/test_autosuggest_suggest_specia'", wd, L"", __LINE__); perform_one_autosuggestion_test(L"cd '~/test_autosuggest_suggest_specia'", wd, L"", __LINE__);
system("rm -Rf '/tmp/autosuggest_test/'"); if (system("rm -Rf '/tmp/autosuggest_test/'")) err(L"rm failed");
system("rm -Rf ~/test_autosuggest_suggest_special/"); if (system("rm -Rf ~/test_autosuggest_suggest_special/")) err(L"rm failed");
} }
static void test_autosuggestion_combining() static void test_autosuggestion_combining()

3
parse_execution.cpp
View file

@ -503,7 +503,6 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(const pars
parse_execution_result_t parse_execution_context_t::run_switch_statement(const parse_node_t &statement) parse_execution_result_t parse_execution_context_t::run_switch_statement(const parse_node_t &statement)
{ {
assert(statement.type == symbol_switch_statement); assert(statement.type == symbol_switch_statement);
parse_execution_result_t ret = parse_execution_success;
const parse_node_t *matching_case_item = NULL; const parse_node_t *matching_case_item = NULL;
parse_execution_result_t result = parse_execution_success; parse_execution_result_t result = parse_execution_success;
@ -530,7 +529,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(const p
{ {
/* Store the node that failed to expand */ /* Store the node that failed to expand */
report_error(switch_value_node, WILDCARD_ERR_MSG, switch_value.c_str()); report_error(switch_value_node, WILDCARD_ERR_MSG, switch_value.c_str());
ret = parse_execution_errored; result = parse_execution_errored;
break; break;
} }