[svn-commits] russell: branch 1.6.1 r161290 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Dec  5 08:18:39 2008
New Revision: 161290

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161290
Log:
Merged revisions 161288 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r161288 | russell | 2008-12-05 08:16:24 -0600 (Fri, 05 Dec 2008) | 10 lines

Merged revisions 161287 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r161287 | russell | 2008-12-05 08:12:14 -0600 (Fri, 05 Dec 2008) | 2 lines

Fix a NULL format string warning found by buildbot.

........

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

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

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=161290&r1=161289&r2=161290
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Fri Dec  5 08:18:39 2008
@@ -7187,7 +7187,7 @@
 static int ast_pbx_outgoing_cdr_failed(void)
 {
 	/* allocate a channel */
-	struct ast_channel *chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0);
+	struct ast_channel *chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "%s", "");
 
 	if (!chan)
 		return -1;  /* failure */