mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-10 04:41:15 -03:00
restyle switch blocks to match project style
I missed restyling a few "switch" blocks to make them consistent with the rest of the code base. This fixes that oversight. This should be the final step in restyling the C++ code to have a consistent style. This also includes a few trivial cleanups elsewhere. I also missed restyling the "complete" module when working my way from a to z so this final change includes restyling that module. Total lint errors decreased 36%. Cppcheck errors went from 47 to 24. Oclint P2 errors went from 819 to 778. Oclint P3 errors went from 3252 to 1842. Resolves #2902.
This commit is contained in:
17
src/exec.cpp
17
src/exec.cpp
@@ -257,23 +257,16 @@ static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain,
|
||||
shared_ptr<io_data_t> out; // gets allocated via new
|
||||
|
||||
switch (in->io_mode) {
|
||||
default:
|
||||
// Unknown type, should never happen.
|
||||
fprintf(stderr, "Unknown io_mode %ld\n", (long)in->io_mode);
|
||||
abort();
|
||||
break;
|
||||
|
||||
// These redirections don't need transmogrification. They can be passed through.
|
||||
case IO_PIPE:
|
||||
case IO_FD:
|
||||
case IO_BUFFER:
|
||||
case IO_CLOSE: {
|
||||
// These redirections don't need transmogrification. They can be passed through.
|
||||
out = in;
|
||||
break;
|
||||
}
|
||||
|
||||
// Transmogrify file redirections.
|
||||
case IO_FILE: {
|
||||
// Transmogrify file redirections.
|
||||
int fd;
|
||||
CAST_INIT(io_file_t *, in_file, in.get());
|
||||
if ((fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK)) == -1) {
|
||||
@@ -288,6 +281,12 @@ static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain,
|
||||
out.reset(new io_fd_t(in->fd, fd, false));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
// Unknown type, should never happen.
|
||||
fprintf(stderr, "Unknown io_mode %ld\n", (long)in->io_mode);
|
||||
abort();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (out.get() != NULL) result_chain.push_back(out);
|
||||
|
||||
Reference in New Issue
Block a user