aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-06 03:02:59 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-06 03:02:59 +0000
commitf349f3d455edd597d0ee95bd709f38845905e1c5 (patch)
treeba8436cb670e139724b6d4469d4fb4622f6284dc /include/asterisk
parent817c511315b9c34e2492988137f8826dadb31bb3 (diff)
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.4@135899 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/threadstorage.h2
-rw-r--r--include/asterisk/utils.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h
index 9021aa551..799a86332 100644
--- a/include/asterisk/threadstorage.h
+++ b/include/asterisk/threadstorage.h
@@ -159,7 +159,7 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co
if (!(buf = ast_calloc(1, init_size)))
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 4b1a7f417..4e4d9d5ee 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -509,7 +509,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 */