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

somehow missed a bunch of gcc 4.3.x warnings in this branch on the first pass

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@153823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-03 13:01:18 +00:00
parent 0d1441526e
commit 18df35a2c1
8 changed files with 103 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/file.c
View File

@@ -265,11 +265,18 @@ static char *build_filename(const char *filename, const char *ext)
if (!strcmp(ext, "wav49"))
ext = "WAV";
if (filename[0] == '/')
asprintf(&fn, "%s.%s", filename, ext);
else
asprintf(&fn, "%s/sounds/%s.%s",
ast_config_AST_DATA_DIR, filename, ext);
if (filename[0] == '/') {
if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
fn = NULL;
}
} else {
if (asprintf(&fn, "%s/sounds/%s.%s",
ast_config_AST_DATA_DIR, filename, ext) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
fn = NULL;
}
}
return fn;
}