[asterisk-commits] tilghman: branch 1.6.0 r135901 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Aug  5 22:04:49 2008
New Revision: 135901

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135901
Log:
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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/threadstorage.h
    branches/1.6.0/include/asterisk/utils.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/threadstorage.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/threadstorage.h?view=diff&rev=135901&r1=135900&r2=135901
==============================================================================
--- branches/1.6.0/include/asterisk/threadstorage.h (original)
+++ branches/1.6.0/include/asterisk/threadstorage.h Tue Aug  5 22:04:49 2008
@@ -199,7 +199,7 @@
 			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;

Modified: branches/1.6.0/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/utils.h?view=diff&rev=135901&r1=135900&r2=135901
==============================================================================
--- branches/1.6.0/include/asterisk/utils.h (original)
+++ branches/1.6.0/include/asterisk/utils.h Tue Aug  5 22:04:49 2008
@@ -591,7 +591,7 @@
 #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 */