diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-06-14 02:21:47 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-06-14 02:21:47 +0000 |
commit | ea90f8c4680cba89f33a9a2f695062734722dc44 (patch) | |
tree | e24cd6e2067e9c06c974391249ea085b40608c69 /file.c | |
parent | 8f77de5ebd4e408db26cb476cd69040cddbe5edd (diff) |
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -866,6 +866,7 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con 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 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con 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 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con } AST_LIST_UNLOCK(&formats); - if (!fs) + + if (!format_found) ast_log(LOG_WARNING, "No such format '%s'\n", type); return fs; |