diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-06 03:04:49 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-06 03:04:49 +0000 |
| commit | 3ff9d7ccdfab16190eccb1ec7a4d2eaab0c53d3e (patch) | |
| tree | 4243902bb0efa6e6511b9d8b698197d6ab13c7fe | |
| parent | c5ed562d7932c1937740098921264d4e410159ed (diff) | |
Merged revisions 135900 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r135900 | tilghman | 2008-08-05 22:04:01 -0500 (Tue, 05 Aug 2008) | 12 lines
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/branches/1.6.0@135901 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/threadstorage.h | 2 | ||||
| -rw-r--r-- | include/asterisk/utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h index 5e6b3c348..de4f05b43 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 074bc085d..b038711f3 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 */ |