From 6c919bbaa07cd613beb00a82fae42c87a5119373 Mon Sep 17 00:00:00 2001 From: mnicholson Date: Mon, 30 Nov 2009 21:37:21 +0000 Subject: Merged revisions 231688 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r231688 | mnicholson | 2009-11-30 15:31:55 -0600 (Mon, 30 Nov 2009) | 15 lines Merged revisions 231614 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231614 | mnicholson | 2009-11-30 15:11:44 -0600 (Mon, 30 Nov 2009) | 8 lines Remove duplicate entries from voicemail format lists. This prevents app_voicemail from entering an infinite loop when the same format is specified twice in the format list. (closes issue #15625) Reported by: Shagg63 Tested by: mnicholson Review: https://reviewboard.asterisk.org/r/429/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@231691 f38db490-d61c-443f-a65b-d21fe96a405b --- main/app.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main/app.c') diff --git a/main/app.c b/main/app.c index c40078df9..e62a893b2 100644 --- a/main/app.c +++ b/main/app.c @@ -45,7 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/linkedlists.h" #include "asterisk/strings.h" -#define MAX_OTHER_FORMATS 10 +#define AST_MAX_FORMATS 10 static AST_RWLIST_HEAD_STATIC(groups, ast_group_info); @@ -575,8 +575,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, char *fmts; char comment[256]; int x, fmtcnt = 1, res = -1, outmsg = 0; - struct ast_filestream *others[MAX_OTHER_FORMATS]; - char *sfmt[MAX_OTHER_FORMATS]; + struct ast_filestream *others[AST_MAX_FORMATS]; + char *sfmt[AST_MAX_FORMATS]; char *stringp = NULL; time_t start, end; struct ast_dsp *sildet = NULL; /* silence detector dsp */ @@ -622,8 +622,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, sfmt[0] = ast_strdupa(fmts); while ((fmt = strsep(&stringp, "|"))) { - if (fmtcnt > MAX_OTHER_FORMATS - 1) { - ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app.c\n"); + if (fmtcnt > AST_MAX_FORMATS - 1) { + ast_log(LOG_WARNING, "Please increase AST_MAX_FORMATS in file.h\n"); break; } sfmt[fmtcnt++] = ast_strdupa(fmt); @@ -805,7 +805,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, } if (prepend && outmsg) { - struct ast_filestream *realfiles[MAX_OTHER_FORMATS]; + struct ast_filestream *realfiles[AST_MAX_FORMATS]; struct ast_frame *fr; for (x = 0; x < fmtcnt; x++) { -- cgit v1.2.3