[svn-commits] russell: branch 1.6.0 r167556 - in /branches/1.6.0: ./ main/file.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jan  7 16:27:47 2009
New Revision: 167556

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

................
r167555 | russell | 2009-01-07 16:27:23 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167554 | russell | 2009-01-07 16:26:42 -0600 (Wed, 07 Jan 2009) | 2 lines

Don't fclose() the file early, the filestream destructor will handle it.

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/file.c

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

Modified: branches/1.6.0/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/file.c?view=diff&rev=167556&r1=167555&r2=167556
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Wed Jan  7 16:27:47 2009
@@ -447,7 +447,6 @@
 					continue;
 				}
 				if (open_wrapper(s)) {
-					fclose(bfile);
 					ast_free(fn);
 					ast_closestream(s);
 					continue;	/* cannot run open on file */