diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
commit | 172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a (patch) | |
tree | 2699ed6525a405595de40da2ec5e31793ee63f16 /mysys/stacktrace.c | |
parent | 02b8232629807ca3e37b99489f8191c549f7569a (diff) | |
download | mariadb-git-172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a.tar.gz |
add safemalloc back
... but differently
client/mysqltest.cc:
my_safe_print_str() don't append \n anymore
dbug/dbug.c:
restore safemalloc as a part of dbug suite
dbug/user.r:
restore 'S' flag documentation
include/my_dbug.h:
restore safemalloc as a part of dbug suite
include/my_sys.h:
move valgrind defines to a dedicated header
mysys/my_malloc.c:
use new safemalloc
mysys/stacktrace.c:
don't append \n. let the calller do it, if needed
sql/mysqld.cc:
my_safe_print_str() don't append \n anymore
Diffstat (limited to 'mysys/stacktrace.c')
-rw-r--r-- | mysys/stacktrace.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index e4999dbbe81..c2e930d76e2 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -117,12 +117,8 @@ static int safe_print_str(const char *addr, int max_len) break; } - /* Output a new line if something was printed. */ - if (total != (size_t) max_len) - fputc('\n', stderr); - if (nbytes == -1) - fprintf(stderr, "Can't read from address %p: %m.\n", addr); + fprintf(stderr, "Can't read from address %p: %m.", addr); close(fd); @@ -144,13 +140,12 @@ void my_safe_print_str(const char* val, int max_len) if (!PTR_SANE(val)) { - fprintf(stderr, "is an invalid pointer\n"); + fprintf(stderr, "is an invalid pointer"); return; } for (; max_len && PTR_SANE(val) && *val; --max_len) fputc(*val++, stderr); - fputc('\n', stderr); } #if defined(HAVE_PRINTSTACK) @@ -704,11 +699,11 @@ void my_safe_print_str(const char *val, int len) { __try { - fprintf(stderr, "%.*s\n", len, val); + fprintf(stderr, "%.*s", len, val); } __except(EXCEPTION_EXECUTE_HANDLER) { - fprintf(stderr, "is an invalid string pointer\n"); + fprintf(stderr, "is an invalid string pointer"); } } #endif /*__WIN__*/ |