diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
| commit | 56e7b7eaede52e8d2123e909d7d42220f8c63143 (patch) | |
| tree | 73e1dc4b2e53d68c3a9d5269f9140142ef08c187 /mysys/stacktrace.c | |
| parent | 9d97e6010ebdeab0579a8371d01f34118c518b30 (diff) | |
| download | mariadb-git-56e7b7eaede52e8d2123e909d7d42220f8c63143.tar.gz | |
Make possible to use clang on Windows (clang-cl)
-DWITH_ASAN can be used as well now, on x64
Fix many clang-cl warnings.
Diffstat (limited to 'mysys/stacktrace.c')
| -rw-r--r-- | mysys/stacktrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index cc759d38664..619172a5a6a 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -703,7 +703,7 @@ void my_print_stacktrace(uchar* unused1, ulong unused2, my_bool silent) if(have_source) { const char *base_file_name= my_basename(line.FileName); - my_safe_printf_stderr("[%s:%u]", + my_safe_printf_stderr("[%s:%lu]", base_file_name, line.LineNumber); } my_safe_printf_stderr("%s", "\n"); @@ -733,7 +733,7 @@ void my_write_core(int unused) if(GetModuleFileName(NULL, path, sizeof(path))) { _splitpath(path, NULL, NULL,dump_fname,NULL); - strncat(dump_fname, ".dmp", sizeof(dump_fname)); + strcat_s(dump_fname, sizeof(dump_fname), ".dmp"); } hFile= CreateFile(dump_fname, GENERIC_WRITE, 0, 0, CREATE_ALWAYS, |