mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-21 09:10:36 +00:00
Fix a build warning, and potential issue if option p is not set at all.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1423,7 +1423,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
ZT_BUFFERINFO bi;
|
ZT_BUFFERINFO bi;
|
||||||
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
|
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
|
||||||
char *buf = __buf + AST_FRIENDLY_OFFSET;
|
char *buf = __buf + AST_FRIENDLY_OFFSET;
|
||||||
char *exitkeys;
|
char *exitkeys = NULL;
|
||||||
|
|
||||||
if (!(user = ast_calloc(1, sizeof(*user))))
|
if (!(user = ast_calloc(1, sizeof(*user))))
|
||||||
return ret;
|
return ret;
|
||||||
@@ -2006,7 +2006,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
} else {
|
} else {
|
||||||
ast_debug(2, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext);
|
ast_debug(2, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext);
|
||||||
}
|
}
|
||||||
} else if ((f->frametype == AST_FRAME_DTMF) && (strchr(exitkeys, f->subclass)) && (confflags & CONFFLAG_KEYEXIT)) {
|
} else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_KEYEXIT) && (strchr(exitkeys, f->subclass))) {
|
||||||
char exitkey[2];
|
char exitkey[2];
|
||||||
|
|
||||||
exitkey[0] = f->subclass;
|
exitkey[0] = f->subclass;
|
||||||
|
|||||||
Reference in New Issue
Block a user