Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

lint: Use early exit/continue

Browse source
This commit is contained in:
Kurtis Rader 2016-10-30 16:04:13 -07:00
parent 6c3900ff64
commit 26c1430e82
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/exec.cpp
View file

@ -1174,10 +1174,12 @@ static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst,
// If the caller asked us to preserve the exit status, restore the old status. Otherwise set the // If the caller asked us to preserve the exit status, restore the old status. Otherwise set the
// status of the subcommand. // status of the subcommand.
proc_set_last_status(apply_exit_status ? subcommand_status : prev_status); proc_set_last_status(apply_exit_status ? subcommand_status : prev_status);
is_subshell = prev_subshell; is_subshell = prev_subshell;
if (lst != NULL && io_buffer.get() != NULL) { if (lst == NULL || io_buffer.get() == NULL) {
return subcommand_status;
}
const char *begin = io_buffer->out_buffer_ptr(); const char *begin = io_buffer->out_buffer_ptr();
const char *end = begin + io_buffer->out_buffer_size(); const char *end = begin + io_buffer->out_buffer_size();
if (split_output) { if (split_output) {
@ -1198,14 +1200,13 @@ static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst,
cursor = stop + (hit_separator ? 1 : 0); cursor = stop + (hit_separator ? 1 : 0);
} }
} else { } else {
// we're not splitting output, but we still want to trim off a trailing newline. // We're not splitting output, but we still want to trim off a trailing newline.
if (end != begin && end[-1] == '\n') { if (end != begin && end[-1] == '\n') {
--end; --end;
} }
const wcstring wc = str2wcstring(begin, end - begin); const wcstring wc = str2wcstring(begin, end - begin);
lst->push_back(wc); lst->push_back(wc);
} }
}
return subcommand_status; return subcommand_status;
} }