diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/call_stack.cpp | 6 | ||||
-rw-r--r-- | src/module.cpp | 8 | ||||
-rw-r--r-- | src/post_mortem.cpp | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/call_stack.cpp b/src/call_stack.cpp index 30abaad..4a13b3a 100644 --- a/src/call_stack.cpp +++ b/src/call_stack.cpp @@ -27,14 +27,14 @@ static std::string put_between_brackets(const T& x) { } std::string format_address_fallback(Address addr) { - return put_between_brackets(format_address(addr)); + return put_between_brackets(address::format(addr)); } std::string offset_from(const std::string& thing, Address offset) { if (offset == 0) return put_between_brackets(thing); else - return put_between_brackets(thing + "+" + format_address(offset)); + return put_between_brackets(thing + "+" + address::format(offset)); } std::string offset_from_module(const ModuleInfo& module, Address addr) { @@ -107,7 +107,7 @@ std::string CallStack::pretty_print_address(const DbgHelp& dbghelp, Address addr void CallStack::dump(std::ostream& os, const DbgHelp& dbghelp) const { for_each_address([&](Address addr) { - os << format_address(addr) << ' ' << pretty_print_address(dbghelp, addr) << '\n'; + os << address::format(addr) << ' ' << pretty_print_address(dbghelp, addr) << '\n'; return true; }); } diff --git a/src/module.cpp b/src/module.cpp index d676151..47d8eaf 100644 --- a/src/module.cpp +++ b/src/module.cpp @@ -60,15 +60,15 @@ Address Module::translate_online_address(Address online) const { std::string Module::invalid_offline_address(Address offline) const { std::ostringstream oss; - oss << "offline address " << format_address(offline) << " doesn't belong to module " - << get_name() << " (base offline address " << format_address(get_offline_base()) << ')'; + oss << "offline address " << address::format(offline) << " doesn't belong to module " + << get_name() << " (base offline address " << address::format(get_offline_base()) << ')'; return oss.str(); } std::string Module::invalid_online_address(Address online) const { std::ostringstream oss; - oss << "online address " << format_address(online) << " doesn't belong to module " << get_name() - << " (base online address " << format_address(get_online_base()) << ')'; + oss << "online address " << address::format(online) << " doesn't belong to module " + << get_name() << " (base online address " << address::format(get_online_base()) << ')'; return oss.str(); } diff --git a/src/post_mortem.cpp b/src/post_mortem.cpp index d365b02..01f180a 100644 --- a/src/post_mortem.cpp +++ b/src/post_mortem.cpp @@ -17,7 +17,7 @@ namespace { std::string pdb_already_loaded(Address online_base, const std::string& path) { std::ostringstream oss; - oss << "module with online base address " << format_address(online_base) + oss << "module with online base address " << address::format(online_base) << " has already been loaded: " << path; return oss.str(); } @@ -30,27 +30,27 @@ std::string pdb_already_loaded(const std::string& path) { std::string offline_base_already_used(Address base) { std::ostringstream oss; - oss << "module with offline base address " << format_address(base) + oss << "module with offline base address " << address::format(base) << " has already been loaded (shouldn't happen)"; return oss.str(); } std::string module_not_found(Address base) { std::ostringstream oss; - oss << "module with base address " << format_address(base) << " wasn't found"; + oss << "module with base address " << address::format(base) << " wasn't found"; return oss.str(); } std::string guess_module_no_modules(Address pivot) { std::ostringstream oss; - oss << "couldn't select a module for address " << format_address(pivot) + oss << "couldn't select a module for address " << address::format(pivot) << ": no modules have been loaded yet"; return oss.str(); } std::string guess_module_address_too_low(Address pivot) { std::ostringstream oss; - oss << "couldn't select a module for address " << format_address(pivot) << ": it's too low"; + oss << "couldn't select a module for address " << address::format(pivot) << ": it's too low"; return oss.str(); } |