kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@33993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-06-14 02:20:22 +00:00
parent 5ae03d8ff8
commit 2d7e3395a6
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

@@ -881,6 +881,7 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
char *fn, *orig_fn = NULL; char *fn, *orig_fn = NULL;
char *buf = NULL; char *buf = NULL;
size_t size = 0; size_t size = 0;
int format_found = 0;
if (ast_mutex_lock(&formatlock)) { if (ast_mutex_lock(&formatlock)) {
ast_log(LOG_WARNING, "Unable to lock format list\n"); ast_log(LOG_WARNING, "Unable to lock format list\n");
@@ -900,6 +901,8 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
for (f = formats; f && !fs; f = f->next) { for (f = formats; f && !fs; f = f->next) {
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);
@@ -980,7 +983,8 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
} }
ast_mutex_unlock(&formatlock); ast_mutex_unlock(&formatlock);
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;