kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 15:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 33993 via svnmerge from

Browse Source 
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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-06-14 02:21:47 +00:00
parent 8f77de5ebd
commit ea90f8c468
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
file.c
View File

@@ -866,6 +866,7 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
struct ast_filestream *fs = NULL; struct ast_filestream *fs = NULL;
char *buf = NULL; char *buf = NULL;
size_t size = 0; size_t size = 0;
int format_found = 0;
if (AST_LIST_LOCK(&formats)) { if (AST_LIST_LOCK(&formats)) {
ast_log(LOG_WARNING, "Unable to lock format list\n"); ast_log(LOG_WARNING, "Unable to lock format list\n");
@@ -892,6 +893,8 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
if (!exts_compare(f->exts, type)) if (!exts_compare(f->exts, type))
continue; continue;
else
format_found = 1;
fn = build_filename(filename, type); fn = build_filename(filename, type);
fd = open(fn, flags | myflags, mode); fd = open(fn, flags | myflags, mode);
@@ -974,7 +977,8 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
} }
AST_LIST_UNLOCK(&formats); AST_LIST_UNLOCK(&formats);
if (!fs)
if (!format_found)
ast_log(LOG_WARNING, "No such format '%s'\n", type); ast_log(LOG_WARNING, "No such format '%s'\n", type);
return fs; return fs;