From ae6749415a9433662f17d8baa6f542d3dd8a08c0 Mon Sep 17 00:00:00 2001 From: tilghman Date: Wed, 6 Aug 2008 03:04:01 +0000 Subject: Merged revisions 135899 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r135899 | tilghman | 2008-08-05 22:02:59 -0500 (Tue, 05 Aug 2008) | 4 lines 1) Bugfix for debugging code 2) Reduce compiler warnings for another section of debugging code (Closes issue #13237) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135900 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/threadstorage.h | 2 +- include/asterisk/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asterisk') diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h index 77f9428b7..09b6b7878 100644 --- a/include/asterisk/threadstorage.h +++ b/include/asterisk/threadstorage.h @@ -199,7 +199,7 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co return NULL; } pthread_setspecific(ts->key, buf); - __ast_threadstorage_object_add(buf, init_size, file, function, line); + __ast_threadstorage_object_add(ts->key, init_size, file, function, line); } return buf; diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 0735babf1..ed69de6ce 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -591,7 +591,7 @@ int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, c #define ast_realloc(a,b) realloc(a,b) #define ast_strdup(a) strdup(a) #define ast_strndup(a,b) strndup(a,b) -#define ast_asprintf(a,b,c) asprintf(a,b,c) +#define ast_asprintf(a,b,...) asprintf(a,b,__VA_ARGS__) #define ast_vasprintf(a,b,c) vasprintf(a,b,c) #endif /* AST_DEBUG_MALLOC */ -- cgit v1.2.3