diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 22:01:54 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 22:01:54 +0000 |
| commit | da8d685878756b280a3643fb4cff5c06be41fedf (patch) | |
| tree | 7c7734fcd73586384f0dcc60bd2e76a84c54d4ef | |
| parent | 2e1c1e23c2c98ae90c3eba495bae6f809cbc9671 (diff) | |
Merged revisions 160791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r160791 | tilghman | 2008-12-03 15:58:21 -0600 (Wed, 03 Dec 2008) | 9 lines
Merged revisions 160770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r160770 | tilghman | 2008-12-03 15:54:07 -0600 (Wed, 03 Dec 2008) | 2 lines
Some compilers warn on null format strings; some don't (caught by buildbot)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160807 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 9ba29e996..50acc066d 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3420,7 +3420,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in if (!ast_strlen_zero(fromstring)) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) { char *ptr; memset(passdata2, 0, len_passdata2); prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, enc_cidnum, enc_cidname, dur, date, passdata2, len_passdata2, category); @@ -3464,7 +3464,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in } if (!ast_strlen_zero(emailsubject)) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) { int vmlen = strlen(emailsubject) * 3 + 200; /* Only allocate more space if the previous was not large enough */ if (vmlen > len_passdata) { @@ -3539,7 +3539,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in fprintf(p, "Content-Type: text/plain; charset=%s" ENDL "Content-Transfer-Encoding: 8bit" ENDL ENDL, charset); if (emailbody) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) { char *passdata; int vmlen = strlen(emailbody) * 3 + 200; passdata = alloca(vmlen); @@ -3662,7 +3662,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char if (*pagerfromstring) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) { char *passdata; int vmlen = strlen(fromstring) * 3 + 200; passdata = alloca(vmlen); @@ -3678,7 +3678,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char fprintf(p, "To: %s\n", pager); if (pagersubject) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) { char *passdata; int vmlen = strlen(pagersubject) * 3 + 200; passdata = alloca(vmlen); @@ -3695,7 +3695,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char ast_strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm); if (pagerbody) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) { char *passdata; int vmlen = strlen(pagerbody) * 3 + 200; passdata = alloca(vmlen); |