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: https://origsvn.digium.com/svn/asterisk/trunk@160791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
9655605944
commit
c42aef2ebb
|
@ -3873,7 +3873,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, flag);
|
||||
|
@ -3917,7 +3917,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) {
|
||||
|
@ -4002,7 +4002,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);
|
||||
|
@ -4146,7 +4146,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);
|
||||
|
@ -4162,7 +4162,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);
|
||||
|
@ -4184,7 +4184,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);
|
||||
|
|
Loading…
Reference in New Issue