From 74cac79218c58e399bec261683617d66652663fe Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 20 Jan 2012 01:57:58 +0100 Subject: - Fix rpl_checksum test. Use basename of file in error messages, not the o nes prefixed with .\ or ./ - Add my_basename() to mysys. - Do not compile files that are not needed on Windows (my_addr_resolve, an d safemalloc related stuff it it is not used) Avoids linker warnings about compilation of essentially empty files. --- mysys/stacktrace.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'mysys/stacktrace.c') diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index 1766c0f503a..30c9fafcb82 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -465,6 +465,7 @@ void my_write_core(int sig) #include #include +#include #if _MSC_VER #pragma comment(lib, "dbghelp") #endif @@ -652,14 +653,10 @@ void my_print_stacktrace(uchar* unused1, ulong unused2) &(package.sym)); have_source= SymGetLineFromAddr64(hProcess, addr, &line_offset, &line); - my_safe_printf_stderr("%p ", addr); + my_safe_printf_stderr("%p ", (uintptr_t)addr); if(have_module) { - char *base_image_name= strrchr(module.ImageName, '\\'); - if(base_image_name) - base_image_name++; - else - base_image_name= module.ImageName; + const char *base_image_name= my_basename(module.ImageName); my_safe_printf_stderr("%s!", base_image_name); } if(have_symbol) @@ -670,11 +667,7 @@ void my_print_stacktrace(uchar* unused1, ulong unused2) if(have_source) { - char *base_file_name= strrchr(line.FileName, '\\'); - if(base_file_name) - base_file_name++; - else - base_file_name= line.FileName; + const char *base_file_name= my_basename(line.FileName); my_safe_printf_stderr("[%s:%u]", base_file_name, line.LineNumber); } -- cgit v1.2.1