[asterisk-commits] russell: trunk r65855 - in /trunk: ./ apps/app_festival.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu May 24 10:04:51 2007
New Revision: 65855

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65855
Log:
Merged revisions 65853 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65853 | russell | 2007-05-24 10:04:14 -0500 (Thu, 24 May 2007) | 4 lines

Ensure that frames are fully initialized.  This will probably fix getting
weird timestamp log messages in logs when using the Festival app.
(issue #9781, patch by me)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_festival.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_festival.c?view=diff&rev=65855&r1=65854&r2=65855
==============================================================================
--- trunk/apps/app_festival.c (original)
+++ trunk/apps/app_festival.c Thu May 24 10:04:51 2007
@@ -180,7 +180,9 @@
 		struct ast_frame f;
 		char offset[AST_FRIENDLY_OFFSET];
 		char frdata[2048];
-	} myf;
+	} myf = {
+		.f = { 0, },
+	};
 	
         if (pipe(fds)) {
                  ast_log(LOG_WARNING, "Unable to create pipe\n");
@@ -241,7 +243,6 @@
 					myf.f.subclass = AST_FORMAT_SLINEAR;
 					myf.f.datalen = res;
 					myf.f.samples = res / 2;
-					myf.f.mallocd = 0;
 					myf.f.offset = AST_FRIENDLY_OFFSET;
 					myf.f.src = __PRETTY_FUNCTION__;
 					myf.f.data = myf.frdata;