kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

More RSW merges. Everything from apps/ except for the big offenders

Browse Source 
app_voicemail and app_queue.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-10 14:45:25 +00:00
parent 357bf3e90b
commit 3ffb39833b
18 changed files with 211 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_dahdibarge.c
View File

@@ -251,11 +251,11 @@ outrun:
static int conf_exec(struct ast_channel *chan, void *data)
{
int res=-1;
int res = -1;
int retrycnt = 0;
int confflags = 0;
int confno = 0;
char confstr[80] = "";
char confnostr[80] = "";
if (!ast_strlen_zero(data)) {
if ((sscanf(data, "DAHDI/%d", &confno) != 1) &&
@@ -270,10 +270,10 @@ static int conf_exec(struct ast_channel *chan, void *data)
while(!confno && (++retrycnt < 4)) {
/* Prompt user for conference number */
confstr[0] = '\0';
res = ast_app_getdata(chan, "conf-getchannel",confstr, sizeof(confstr) - 1, 0);
confnostr[0] = '\0';
res = ast_app_getdata(chan, "conf-getchannel",confnostr, sizeof(confnostr) - 1, 0);
if (res <0) goto out;
if (sscanf(confstr, "%d", &confno) != 1)
if (sscanf(confnostr, "%d", &confno) != 1)
confno = 0;
}
if (confno) {