From 29e4061494e1ac4e40b2b09fd3e35c310ca137fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Bourlet?= Date: Mon, 4 May 2020 15:01:55 -0700 Subject: [PATCH] clang-format --- backward.hpp | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/backward.hpp b/backward.hpp index 9572c92..8fba93d 100644 --- a/backward.hpp +++ b/backward.hpp @@ -481,7 +481,7 @@ template struct default_delete { void operator()(T &ptr) const { delete ptr; } }; -template > +template > class handle { struct dummy; T _val; @@ -609,9 +609,9 @@ inline std::vector split_source_prefixes(const std::string &s) { std::vector out; size_t last = 0; size_t next = 0; - size_t delimiter_size = sizeof(kBackwardPathDelimiter)-1; + size_t delimiter_size = sizeof(kBackwardPathDelimiter) - 1; while ((next = s.find(kBackwardPathDelimiter, last)) != std::string::npos) { - out.push_back(s.substr(last, next-last)); + out.push_back(s.substr(last, next - last)); last = next + delimiter_size; } if (last <= s.length()) { @@ -908,7 +908,7 @@ class StackTraceImpl : public StackTraceImplHolder { HANDLE process = GetCurrentProcess(); STACKFRAME64 s; - memset(&s, 0, sizeof (STACKFRAME64)); + memset(&s, 0, sizeof(STACKFRAME64)); // TODO: 32 bit context capture s.AddrStack.Mode = AddrModeFlat; @@ -1001,15 +1001,14 @@ class TraceResolverImplBase { #ifdef BACKWARD_SYSTEM_LINUX -class TraceResolverLinuxBase - : public TraceResolverImplBase { +class TraceResolverLinuxBase : public TraceResolverImplBase { public: TraceResolverLinuxBase() - : argv0_(get_argv0()), exec_path_(read_symlink("/proc/self/exe")) { - } + : argv0_(get_argv0()), exec_path_(read_symlink("/proc/self/exe")) {} std::string resolve_exec_path(Dl_info &symbol_info) const { - // mutates symbol_info.dli_fname to be filename to open and returns filename to display - if(symbol_info.dli_fname == argv0_) { + // mutates symbol_info.dli_fname to be filename to open and returns filename + // to display + if (symbol_info.dli_fname == argv0_) { // dladdr returns argv[0] in dli_fname for symbols contained in // the main executable, which is not a valid path if the // executable was found by a search of the PATH environment @@ -1022,6 +1021,7 @@ class TraceResolverLinuxBase return symbol_info.dli_fname; } } + private: std::string argv0_; std::string exec_path_; @@ -1262,7 +1262,7 @@ class TraceResolverLinuxImpl bool _bfd_loaded; typedef details::handle > + details::deleter> bfd_handle_t; typedef details::handle bfd_symtab_t; @@ -1636,9 +1636,9 @@ class TraceResolverLinuxImpl } private: - typedef details::handle > + typedef details::handle> dwfl_handle_t; - details::handle > + details::handle> _dwfl_cb; dwfl_handle_t _dwfl_handle; bool _dwfl_handle_initialized; @@ -1962,14 +1962,14 @@ class TraceResolverLinuxImpl private: bool _dwarf_loaded; - typedef details::handle > + typedef details::handle> dwarf_file_t; - typedef details::handle > + typedef details::handle> dwarf_elf_t; typedef details::handle > + details::deleter> dwarf_handle_t; typedef std::map die_linemap_t; @@ -3352,7 +3352,7 @@ template <> class TraceResolverImpl { char name[256]; - memset(&sym, 0, sizeof sym); + memset(&sym, 0, sizeof sym); sym.sym.SizeOfStruct = sizeof(SYMBOL_INFO); sym.sym.MaxNameLen = max_sym_len; @@ -3403,19 +3403,20 @@ class TraceResolver : public TraceResolverImpl {}; class SourceFile { public: - typedef std::vector > lines_t; + typedef std::vector> lines_t; SourceFile() {} SourceFile(const std::string &path) { // 1. If BACKWARD_CXX_SOURCE_PREFIXES is set then assume it contains // a colon-separated list of path prefixes. Try prepending each // to the given path until a valid file is found. - const std::vector& prefixes = get_paths_from_env_variable(); + const std::vector &prefixes = get_paths_from_env_variable(); for (size_t i = 0; i < prefixes.size(); ++i) { // Double slashes (//) should not be a problem. std::string new_path = prefixes[i] + '/' + path; _file.reset(new std::ifstream(new_path.c_str())); - if (is_open()) break; + if (is_open()) + break; } // 2. If no valid file found then fallback to opening the path as-is. if (!_file || !is_open()) { @@ -3514,19 +3515,19 @@ class SourceFile { #endif private: - details::handle > + details::handle> _file; std::vector get_paths_from_env_variable_impl() { std::vector paths; - const char* prefixes_str = std::getenv("BACKWARD_CXX_SOURCE_PREFIXES"); + const char *prefixes_str = std::getenv("BACKWARD_CXX_SOURCE_PREFIXES"); if (prefixes_str && prefixes_str[0]) { paths = details::split_source_prefixes(prefixes_str); } return paths; } - const std::vector& get_paths_from_env_variable() { + const std::vector &get_paths_from_env_variable() { static std::vector paths = get_paths_from_env_variable_impl(); return paths; } @@ -3930,7 +3931,8 @@ class SignalHandling { #elif defined(__aarch64__) error_addr = reinterpret_cast(uctx->uc_mcontext.pc); #elif defined(__mips__) - error_addr = reinterpret_cast(reinterpret_cast(&uctx->uc_mcontext)->sc_pc); + error_addr = reinterpret_cast( + reinterpret_cast(&uctx->uc_mcontext)->sc_pc); #elif defined(__ppc__) || defined(__powerpc) || defined(__powerpc__) || \ defined(__POWERPC__) error_addr = reinterpret_cast(uctx->uc_mcontext.regs->nip);