[svn-commits] trunk r33994 - in /trunk: ./ file.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jun 13 21:21:47 2006
New Revision: 33994

URL: http://svn.digium.com/view/asterisk?rev=33994&view=rev
Log:
Merged revisions 33993 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33993 | kpfleming | 2006-06-13 21:20:22 -0500 (Tue, 13 Jun 2006) | 2 lines

don't output 'no format found' when we _did_ find the format but couldn't open the desired file for some other reason

........

Modified:
    trunk/   (props changed)
    trunk/file.c

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

Modified: trunk/file.c
URL: http://svn.digium.com/view/asterisk/trunk/file.c?rev=33994&r1=33993&r2=33994&view=diff
==============================================================================
--- trunk/file.c (original)
+++ trunk/file.c Tue Jun 13 21:21:47 2006
@@ -866,6 +866,7 @@
 	struct ast_filestream *fs = NULL;
 	char *buf = NULL;
 	size_t size = 0;
+	int format_found = 0;
 
 	if (AST_LIST_LOCK(&formats)) {
 		ast_log(LOG_WARNING, "Unable to lock format list\n");
@@ -892,6 +893,8 @@
 
 		if (!exts_compare(f->exts, type))
 			continue;
+		else
+			format_found = 1;
 
 		fn = build_filename(filename, type);
 		fd = open(fn, flags | myflags, mode);
@@ -974,7 +977,8 @@
 	}
 
 	AST_LIST_UNLOCK(&formats);
-	if (!fs)
+
+	if (!format_found)
 		ast_log(LOG_WARNING, "No such format '%s'\n", type);
 
 	return fs;