From 3f90efca38079922b4b21707001d7bb9630107eb Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Mon, 25 Jul 2022 15:57:01 +0200 Subject: [PATCH] clang-format C++ files Or should we stop using it? I'm fine with either always or never using auto-formatting but our current way of using it only sometimes is confusing. No functional change. --- src/builtins/history.cpp | 3 +- src/builtins/path.cpp | 128 +++++++++++++++++-------------------- src/builtins/path.h | 2 +- src/builtins/printf.cpp | 6 +- src/builtins/printf.h | 2 +- src/builtins/realpath.cpp | 6 +- src/builtins/set.cpp | 21 ++++-- src/builtins/set_color.cpp | 4 +- src/builtins/status.cpp | 3 +- src/builtins/test.cpp | 6 +- src/common.cpp | 6 +- src/env.cpp | 4 +- src/input.cpp | 3 +- src/postfork.cpp | 3 +- 14 files changed, 97 insertions(+), 100 deletions(-) diff --git a/src/builtins/history.cpp b/src/builtins/history.cpp index 2f43cc5c4..d4762f3ba 100644 --- a/src/builtins/history.cpp +++ b/src/builtins/history.cpp @@ -306,8 +306,7 @@ maybe_t builtin_history(parser_t &parser, io_streams_t &streams, const wcha } if (in_private_mode(parser.vars())) { - streams.err.append_format( - _(L"%ls: can't merge history in private mode\n"), cmd); + streams.err.append_format(_(L"%ls: can't merge history in private mode\n"), cmd); status = STATUS_INVALID_ARGS; break; } diff --git a/src/builtins/path.cpp b/src/builtins/path.cpp index b4b3c58ae..bca0d44e7 100644 --- a/src/builtins/path.cpp +++ b/src/builtins/path.cpp @@ -37,7 +37,7 @@ static void path_error(io_streams_t &streams, const wchar_t *fmt, ...) { } static void path_unknown_option(parser_t &parser, io_streams_t &streams, const wchar_t *subcmd, - const wchar_t *opt) { + const wchar_t *opt) { path_error(streams, BUILTIN_ERR_UNKNOWN, subcmd, opt); builtin_print_error_trailer(parser, streams.err, L"path"); } @@ -115,7 +115,8 @@ class arg_iterator_t { } public: - arg_iterator_t(const wchar_t *const *argv, int argidx, const io_streams_t &streams, bool split_null) + arg_iterator_t(const wchar_t *const *argv, int argidx, const io_streams_t &streams, + bool split_null) : argv_(argv), argidx_(argidx), have_split_(split_null), streams_(streams) {} const wcstring *nextstr() { @@ -135,11 +136,11 @@ class arg_iterator_t { enum { TYPE_BLOCK = 1 << 0, /// A block device TYPE_DIR = 1 << 1, /// A directory - TYPE_FILE = 1 << 2, /// A regular file - TYPE_LINK = 1 << 3, /// A link - TYPE_CHAR = 1 << 4, /// A character device - TYPE_FIFO = 1 << 5, /// A fifo - TYPE_SOCK = 1 << 6, /// A socket + TYPE_FILE = 1 << 2, /// A regular file + TYPE_LINK = 1 << 3, /// A link + TYPE_CHAR = 1 << 4, /// A character device + TYPE_FIFO = 1 << 5, /// A fifo + TYPE_SOCK = 1 << 6, /// A socket }; typedef uint32_t path_type_flags_t; @@ -190,8 +191,7 @@ struct options_t { //!OCLINT(too many fields) static void path_out(io_streams_t &streams, const options_t &opts, const wcstring &str) { if (!opts.quiet) { if (!opts.null_out) { - streams.out.append_with_separation(str, - separation_type_t::explicitly); + streams.out.append_with_separation(str, separation_type_t::explicitly); } else { streams.out.append(str); streams.out.push_back(L'\0'); @@ -261,7 +261,6 @@ static int handle_flag_t(const wchar_t **argv, parser_t &parser, io_streams_t &s return STATUS_INVALID_ARGS; } - static int handle_flag_p(const wchar_t **argv, parser_t &parser, io_streams_t &streams, const wgetopter_t &w, options_t *opts) { if (opts->perm_valid) { @@ -299,7 +298,7 @@ static int handle_flag_p(const wchar_t **argv, parser_t &parser, io_streams_t &s } static int handle_flag_perms(const wchar_t **argv, parser_t &parser, io_streams_t &streams, - const wgetopter_t &w, options_t *opts, path_perm_flags_t perm ) { + const wgetopter_t &w, options_t *opts, path_perm_flags_t perm) { if (opts->perm_valid) { if (!opts->have_perm) opts->perm = 0; opts->have_perm = true; @@ -387,7 +386,7 @@ static int handle_flag_u(const wchar_t **argv, parser_t &parser, io_streams_t &s } static int handle_flag_key(const wchar_t **argv, parser_t &parser, io_streams_t &streams, - const wgetopter_t &w, options_t *opts) { + const wgetopter_t &w, options_t *opts) { UNUSED(argv); UNUSED(parser); UNUSED(streams); @@ -420,8 +419,7 @@ static wcstring construct_short_opts(options_t *opts) { //!OCLINT(high npath co // Note that several long flags share the same short flag. That is okay. The caller is expected // to indicate that a max of one of the long flags sharing a short flag is valid. // Remember: adjust the completions in share/completions/ when options change -static const struct woption long_options[] = { - {L"quiet", no_argument, nullptr, 'q'}, +static const struct woption long_options[] = {{L"quiet", no_argument, nullptr, 'q'}, {L"null-in", no_argument, nullptr, 'z'}, {L"null-out", no_argument, nullptr, 'Z'}, {L"perm", required_argument, nullptr, 'p'}, @@ -434,14 +432,10 @@ static const struct woption long_options[] = { {}}; static const std::unordered_map flag_to_function = { - {'q', handle_flag_q}, {'v', handle_flag_v}, - {'z', handle_flag_z}, {'Z', handle_flag_Z}, - {'t', handle_flag_t}, {'p', handle_flag_p}, - {'r', handle_flag_r}, {'w', handle_flag_w}, - {'x', handle_flag_x}, {'f', handle_flag_f}, - {'l', handle_flag_l}, {'d', handle_flag_d}, - {'l', handle_flag_l}, {'d', handle_flag_d}, - {'u', handle_flag_u}, {1, handle_flag_key}, + {'q', handle_flag_q}, {'v', handle_flag_v}, {'z', handle_flag_z}, {'Z', handle_flag_Z}, + {'t', handle_flag_t}, {'p', handle_flag_p}, {'r', handle_flag_r}, {'w', handle_flag_w}, + {'x', handle_flag_x}, {'f', handle_flag_f}, {'l', handle_flag_l}, {'d', handle_flag_d}, + {'l', handle_flag_l}, {'d', handle_flag_d}, {'u', handle_flag_u}, {1, handle_flag_key}, {'R', handle_flag_R}, }; @@ -492,7 +486,7 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, co } static int path_transform(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv, - wcstring (*func)(wcstring)) { + wcstring (*func)(wcstring)) { options_t opts; int optind; int retval = parse_opts(&opts, &optind, 0, argc, argv, parser, streams); @@ -516,7 +510,6 @@ static int path_transform(parser_t &parser, io_streams_t &streams, int argc, con return n_transformed > 0 ? STATUS_CMD_OK : STATUS_CMD_ERROR; } - static int path_basename(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv) { return path_transform(parser, streams, argc, argv, wbasename); } @@ -636,26 +629,26 @@ static int path_normalize(parser_t &parser, io_streams_t &streams, int argc, con return path_transform(parser, streams, argc, argv, normalize_helper); } -static maybe_t find_extension (const wcstring &path) { - // The extension belongs to the basename, - // if there is a "." before the last component it doesn't matter. - // e.g. ~/.config/fish/conf.d/foo - // does not have an extension! The ".d" here is not a file extension for "foo". - // And "~/.config" doesn't have an extension either - the ".config" is the filename. - wcstring filename = wbasename(path); +static maybe_t find_extension(const wcstring &path) { + // The extension belongs to the basename, + // if there is a "." before the last component it doesn't matter. + // e.g. ~/.config/fish/conf.d/foo + // does not have an extension! The ".d" here is not a file extension for "foo". + // And "~/.config" doesn't have an extension either - the ".config" is the filename. + wcstring filename = wbasename(path); - // "." and ".." aren't really *files* and therefore don't have an extension. - if (filename == L"." || filename == L"..") return none(); + // "." and ".." aren't really *files* and therefore don't have an extension. + if (filename == L"." || filename == L"..") return none(); - // If we don't have a "." or the "." is the first in the filename, - // we do not have an extension - size_t pos = filename.find_last_of(L'.'); - if (pos == wcstring::npos || pos == 0) { - return none(); - } + // If we don't have a "." or the "." is the first in the filename, + // we do not have an extension + size_t pos = filename.find_last_of(L'.'); + if (pos == wcstring::npos || pos == 0) { + return none(); + } - // Convert pos back to what it would be in the original path. - return pos + path.size() - filename.size(); + // Convert pos back to what it would be in the original path. + return pos + path.size() - filename.size(); } static int path_extension(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv) { @@ -687,7 +680,8 @@ static int path_extension(parser_t &parser, io_streams_t &streams, int argc, con return n_transformed > 0 ? STATUS_CMD_OK : STATUS_CMD_ERROR; } -static int path_change_extension(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv) { +static int path_change_extension(parser_t &parser, io_streams_t &streams, int argc, + const wchar_t **argv) { options_t opts; int optind; int retval = parse_opts(&opts, &optind, 1, argc, argv, parser, streams); @@ -741,7 +735,7 @@ static int path_resolve(parser_t &parser, io_streams_t &streams, int argc, const next = path_apply_working_directory(*arg, parser.vars().get_pwd_slash()); } auto rest = wbasename(next); - while(!next.empty() && next != L"/") { + while (!next.empty() && next != L"/") { next = wdirname(next); real = wrealpath(next); if (real) { @@ -782,16 +776,12 @@ static int path_sort(parser_t &parser, io_streams_t &streams, int argc, const wc int retval = parse_opts(&opts, &optind, 0, argc, argv, parser, streams); if (retval != STATUS_CMD_OK) return retval; - auto keyfunc = +[] (const wcstring &x) { - return wbasename(x); - }; + auto keyfunc = +[](const wcstring &x) { return wbasename(x); }; if (opts.have_key) { if (std::wcscmp(opts.key, L"basename") == 0) { // Do nothing, this is the default } else if (std::wcscmp(opts.key, L"dirname") == 0) { - keyfunc = +[] (const wcstring &x) { - return wdirname(x); - }; + keyfunc = +[](const wcstring &x) { return wdirname(x); }; } else if (std::wcscmp(opts.key, L"path") == 0) { // Act as if --key hadn't been given. opts.have_key = false; @@ -816,30 +806,27 @@ static int path_sort(parser_t &parser, io_streams_t &streams, int argc, const wc // We use a stable sort here, and also explicit < and >, // to avoid changing the order so you can chain calls. - std::stable_sort(list.begin(), list.end(), - [&](const wcstring &a, const wcstring &b) { - if (!opts.reverse) - return (wcsfilecmp_glob(key[a].c_str(), key[b].c_str()) < 0); - else - return (wcsfilecmp_glob(key[a].c_str(), key[b].c_str()) > 0); - }); + std::stable_sort(list.begin(), list.end(), [&](const wcstring &a, const wcstring &b) { + if (!opts.reverse) + return (wcsfilecmp_glob(key[a].c_str(), key[b].c_str()) < 0); + else + return (wcsfilecmp_glob(key[a].c_str(), key[b].c_str()) > 0); + }); if (opts.unique) { - list.erase(std::unique(list.begin(), list.end(), - [&](const wcstring &a, const wcstring &b) { - return key[a] == key[b]; - }), - list.end()); + list.erase( + std::unique(list.begin(), list.end(), + [&](const wcstring &a, const wcstring &b) { return key[a] == key[b]; }), + list.end()); } } else { // Without --key, we just sort by the entire path, // so we have no need to transform and such. - std::stable_sort(list.begin(), list.end(), - [&](const wcstring &a, const wcstring &b) { - if (!opts.reverse) - return (wcsfilecmp_glob(a.c_str(), b.c_str()) < 0); - else - return (wcsfilecmp_glob(a.c_str(), b.c_str()) > 0); - }); + std::stable_sort(list.begin(), list.end(), [&](const wcstring &a, const wcstring &b) { + if (!opts.reverse) + return (wcsfilecmp_glob(a.c_str(), b.c_str()) < 0); + else + return (wcsfilecmp_glob(a.c_str(), b.c_str()) > 0); + }); if (opts.unique) { list.erase(std::unique(list.begin(), list.end()), list.end()); } @@ -855,7 +842,8 @@ static int path_sort(parser_t &parser, io_streams_t &streams, int argc, const wc // All strings are taken to be filenames, and if they match the type/perms/etc (and exist!) // they are passed along. -static int path_filter(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv, bool is_is) { +static int path_filter(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv, + bool is_is) { options_t opts; opts.type_valid = true; opts.perm_valid = true; @@ -908,7 +896,7 @@ static constexpr const struct path_subcommand { const wchar_t **argv); //!OCLINT(unused param) } path_subcommands[] = { // TODO: Which operations do we want? - {L"basename", &path_basename}, + {L"basename", &path_basename}, // {L"change-extension", &path_change_extension}, {L"dirname", &path_dirname}, {L"extension", &path_extension}, diff --git a/src/builtins/path.h b/src/builtins/path.h index 6ada1130d..0bfb311f5 100644 --- a/src/builtins/path.h +++ b/src/builtins/path.h @@ -4,8 +4,8 @@ #include #include -#include "../maybe.h" #include "../io.h" +#include "../maybe.h" class parser_t; diff --git a/src/builtins/printf.cpp b/src/builtins/printf.cpp index 5e0e28d93..d1a7f17ae 100644 --- a/src/builtins/printf.cpp +++ b/src/builtins/printf.cpp @@ -168,12 +168,14 @@ void builtin_printf_state_t::verify_numeric(const wchar_t *s, const wchar_t *end this->fatal_error(_(L"%ls: expected a numeric value"), s); } else { // This isn't entirely fatal - the value should still be printed. - this->nonfatal_error(_(L"%ls: value not completely converted (can't convert '%ls')"), s, end); + this->nonfatal_error(_(L"%ls: value not completely converted (can't convert '%ls')"), s, + end); // Warn about octal numbers as they can be confusing. // Do it if the unconverted digit is a valid hex digit, // because it could also be an "0x" -> "0" typo. if (*s == L'0' && iswxdigit(*end)) { - this->nonfatal_error(_(L"Hint: a leading '0' without an 'x' indicates an octal number"), s, end); + this->nonfatal_error( + _(L"Hint: a leading '0' without an 'x' indicates an octal number"), s, end); } } } diff --git a/src/builtins/printf.h b/src/builtins/printf.h index e0ffa4e4f..d98d455a5 100644 --- a/src/builtins/printf.h +++ b/src/builtins/printf.h @@ -5,8 +5,8 @@ #include #include -#include "../maybe.h" #include "../io.h" +#include "../maybe.h" class parser_t; diff --git a/src/builtins/realpath.cpp b/src/builtins/realpath.cpp index 7d7aaa29a..5f4872cda 100644 --- a/src/builtins/realpath.cpp +++ b/src/builtins/realpath.cpp @@ -104,10 +104,12 @@ maybe_t builtin_realpath(parser_t &parser, io_streams_t &streams, const wch // We need to get the *physical* pwd here. auto realpwd = wrealpath(parser.vars().get_pwd_slash()); if (!realpwd) { - streams.err.append_format(L"builtin %ls: realpath failed: %s\n", cmd, std::strerror(errno)); + streams.err.append_format(L"builtin %ls: realpath failed: %s\n", cmd, + std::strerror(errno)); return STATUS_CMD_ERROR; } - wcstring absolute_arg = string_prefixes_string(L"/", arg) ? arg : path_apply_working_directory(arg, *realpwd); + wcstring absolute_arg = + string_prefixes_string(L"/", arg) ? arg : path_apply_working_directory(arg, *realpwd); streams.out.append(normalize_path(absolute_arg, /* allow leading double slashes */ false)); } diff --git a/src/builtins/set.cpp b/src/builtins/set.cpp index 7ebef09d9..c26c1ce32 100644 --- a/src/builtins/set.cpp +++ b/src/builtins/set.cpp @@ -569,8 +569,10 @@ static int builtin_set_show(const wchar_t *cmd, const set_cmd_opts_t &opts, int // Show the originally imported value as a debugging aid. auto inherited = inheriteds.find(name); if (inherited != inheriteds.end()) { - const wcstring escaped_val = escape_string(inherited->second, ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT); - streams.out.append_format(_(L"$%ls: originally inherited as |%ls|\n"), name.c_str(), escaped_val.c_str()); + const wcstring escaped_val = + escape_string(inherited->second, ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT); + streams.out.append_format(_(L"$%ls: originally inherited as |%ls|\n"), name.c_str(), + escaped_val.c_str()); } } } else { @@ -595,8 +597,10 @@ static int builtin_set_show(const wchar_t *cmd, const set_cmd_opts_t &opts, int show_scope(arg, ENV_UNIVERSAL, streams, vars); auto inherited = inheriteds.find(arg); if (inherited != inheriteds.end()) { - const wcstring escaped_val = escape_string(inherited->second, ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT); - streams.out.append_format(_(L"$%ls: originally inherited as |%ls|\n"), arg, escaped_val.c_str()); + const wcstring escaped_val = + escape_string(inherited->second, ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT); + streams.out.append_format(_(L"$%ls: originally inherited as |%ls|\n"), arg, + escaped_val.c_str()); } } } @@ -735,9 +739,12 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, c streams.err.append_format(BUILTIN_ERR_VARNAME, cmd, split->varname.c_str()); auto pos = split->varname.find(L'='); if (pos != wcstring::npos) { - streams.err.append_format(L"%ls: Did you mean `set %ls %ls`?", cmd, - escape_string(split->varname.substr(0, pos), ESCAPE_ALL, STRING_STYLE_SCRIPT).c_str(), - escape_string(split->varname.substr(pos + 1), ESCAPE_ALL, STRING_STYLE_SCRIPT).c_str()); + streams.err.append_format( + L"%ls: Did you mean `set %ls %ls`?", cmd, + escape_string(split->varname.substr(0, pos), ESCAPE_ALL, STRING_STYLE_SCRIPT) + .c_str(), + escape_string(split->varname.substr(pos + 1), ESCAPE_ALL, STRING_STYLE_SCRIPT) + .c_str()); } builtin_print_error_trailer(parser, streams.err, cmd); return STATUS_INVALID_ARGS; diff --git a/src/builtins/set_color.cpp b/src/builtins/set_color.cpp index 26b16a9b1..114fd0880 100644 --- a/src/builtins/set_color.cpp +++ b/src/builtins/set_color.cpp @@ -63,8 +63,8 @@ static void print_modifiers(outputter_t &outp, bool bold, bool underline, bool i } } -static void print_colors(io_streams_t &streams, wcstring_list_t args, bool bold, bool underline, bool italics, bool dim, - bool reverse, rgb_color_t bg) { +static void print_colors(io_streams_t &streams, wcstring_list_t args, bool bold, bool underline, + bool italics, bool dim, bool reverse, rgb_color_t bg) { outputter_t outp; if (args.empty()) args = rgb_color_t::named_color_names(); for (const auto &color_name : args) { diff --git a/src/builtins/status.cpp b/src/builtins/status.cpp index 4b98cd826..01653136b 100644 --- a/src/builtins/status.cpp +++ b/src/builtins/status.cpp @@ -457,7 +457,8 @@ maybe_t builtin_status(parser_t &parser, io_streams_t &streams, const wchar CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd); auto path = str2wcstring(get_executable_path("fish")); if (path.empty()) { - streams.err.append_format(L"%ls: Could not get executable path: '%s'\n", cmd, std::strerror(errno)); + streams.err.append_format(L"%ls: Could not get executable path: '%s'\n", cmd, + std::strerror(errno)); break; } diff --git a/src/builtins/test.cpp b/src/builtins/test.cpp index 06c4b87a8..e22329511 100644 --- a/src/builtins/test.cpp +++ b/src/builtins/test.cpp @@ -65,9 +65,9 @@ enum token_t { test_string_equal, // "=", true if strings are identical test_string_not_equal, // "!=", true if strings are not identical - test_file_newer, // f1 -nt f2, true if f1 exists and is newer than f2, or there is no f2 - test_file_older, // f1 -ot f2, true if f2 exists and f1 does not, or f1 is older than f2 - test_file_same, // f1 -ef f2, true if f1 and f2 exist and refer to same file + test_file_newer, // f1 -nt f2, true if f1 exists and is newer than f2, or there is no f2 + test_file_older, // f1 -ot f2, true if f2 exists and f1 does not, or f1 is older than f2 + test_file_same, // f1 -ef f2, true if f1 and f2 exist and refer to same file test_number_equal, // "-eq", true if numbers are equal test_number_not_equal, // "-ne", true if numbers are not equal diff --git a/src/common.cpp b/src/common.cpp index 284a850ba..d4a1608c1 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -1863,11 +1863,11 @@ std::string get_executable_path(const char *argv0) { // compatibility layer). We can use sysctl instead: per sysctl(3), passing in a process ID of -1 // returns the value for the current process. size_t buff_size = sizeof buff; - #if defined(__NetBSD__) +#if defined(__NetBSD__) int name[] = {CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_PATHNAME}; - #else +#else int name[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1}; - #endif +#endif int result = sysctl(name, sizeof(name) / sizeof(int), buff, &buff_size, nullptr, 0); if (result != 0) { wperror(L"sysctl KERN_PROC_PATHNAME"); diff --git a/src/env.cpp b/src/env.cpp index 1a73abb7d..2e142251d 100644 --- a/src/env.cpp +++ b/src/env.cpp @@ -287,9 +287,7 @@ static void setup_path() { static std::map inheriteds; -const std::map &env_get_inherited() { - return inheriteds; -} +const std::map &env_get_inherited() { return inheriteds; } void env_init(const struct config_paths_t *paths, bool do_uvars, bool default_paths) { env_stack_t &vars = env_stack_t::principal(); diff --git a/src/input.cpp b/src/input.cpp index eef039c97..329b8e6b4 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -754,7 +754,8 @@ char_event_t inputter_t::read_char(const command_handler_t &command_handler) { case readline_cmd_t::func_or: { // If previous function has correct status, we keep reading tokens if (evt.get_readline() == readline_cmd_t::func_and) { - // Don't return immediately, we might need to handle it here - like self-insert. + // Don't return immediately, we might need to handle it here - like + // self-insert. if (function_status_) continue; } else { if (!function_status_) continue; diff --git a/src/postfork.cpp b/src/postfork.cpp index 8c6263ade..4e2e7bbfe 100644 --- a/src/postfork.cpp +++ b/src/postfork.cpp @@ -545,8 +545,7 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const * } #ifdef EBADARCH case EBADARCH: { - FLOGF_SAFE(exec, - "Failed to execute process '%s': Bad CPU type in executable.", + FLOGF_SAFE(exec, "Failed to execute process '%s': Bad CPU type in executable.", actual_cmd); break; }