Merged revisions 49413 via svnmerge from

https://svn.digium.com/svn/asterisk/branches/1.4

................
r49413 | mogorman | 2007-01-04 10:50:56 -0600 (Thu, 04 Jan 2007) | 11 lines

Merged revisions 49412 via svnmerge from 
https://svn.digium.com/svn/asterisk/branches/1.2

........
r49412 | mogorman | 2007-01-04 10:48:43 -0600 (Thu, 04 Jan 2007) | 3 lines

good catch russell sorry i missed that.
fix magic number with proper sizeof

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Matt O'Gorman 19 years ago
parent c873acd2e7
commit 29434b4b93

@ -2897,14 +2897,14 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
else
ast_copy_string(ext_context, vmu->context, sizeof(ext_context));
if (ast_test_flag(options, OPT_BUSY_GREETING)) {
res = create_dirpath(dest, 256, vmu->context, ext, "busy");
res = create_dirpath(dest, sizeof(dest), vmu->context, ext, "busy");
snprintf(prefile, sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, ext);
} else if (ast_test_flag(options, OPT_UNAVAIL_GREETING)) {
res = create_dirpath(dest, 256, vmu->context, ext, "unavail");
res = create_dirpath(dest, sizeof(dest), vmu->context, ext, "unavail");
snprintf(prefile, sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, ext);
}
snprintf(tempfile, sizeof(tempfile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, ext);
if (!(res = create_dirpath(dest, 256, vmu->context, ext, "temp"))) {
if (!(res = create_dirpath(dest, sizeof(dest), vmu->context, ext, "temp"))) {
ast_log(LOG_WARNING, "Failed to make directory (%s)\n", tempfile);
return -1;
}
@ -5940,7 +5940,7 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st
}
snprintf(prefile, sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username);
if (!(res = create_dirpath(dest, 256, vmu->context, vms->username, "temp"))) {
if (!(res = create_dirpath(dest, sizeof(dest), vmu->context, vms->username, "temp"))) {
ast_log(LOG_WARNING, "Failed to create directory (%s).\n", prefile);
return -1;
}

Loading…
Cancel
Save