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: https://origsvn.digium.com/svn/asterisk/trunk@135900 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h
index 77f9428..09b6b78 100644 (file)
--- 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 0735bab..ed69de6 100644 (file)
--- 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 */