more code restructuring

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Luigi Rizzo 19 years ago
parent 3b5fccac94
commit 481cde0294

22
pbx.c

@ -1698,14 +1698,16 @@ void ast_hint_state_changed(const char *device)
AST_LIST_TRAVERSE(&hints, hint, list) {
struct ast_state_cb *cblist;
char buf[AST_MAX_EXTENSION];
char *parse;
char *parse = buf;
char *cur;
int state;
ast_copy_string(buf, ast_get_extension_app(hint->exten), sizeof(buf));
parse = buf;
for (cur = strsep(&parse, "&"); cur; cur = strsep(&parse, "&")) {
if (strcasecmp(cur, device))
while ( (cur = strsep(&parse, "&")) ) {
if (!strcasecmp(cur, device))
break;
}
if (!cur)
continue;
/* Get device state for this hint */
@ -1725,8 +1727,6 @@ void ast_hint_state_changed(const char *device)
cblist->callback(hint->exten->parent->name, hint->exten->exten, state, cblist->data);
hint->laststate = state;
break;
}
}
AST_LIST_UNLOCK(&hints);
@ -3952,16 +3952,15 @@ int ast_context_add_ignorepat2(struct ast_context *con, const char *value, const
int ast_ignore_pattern(const char *context, const char *pattern)
{
struct ast_context *con;
struct ast_ignorepat *pat;
con = ast_context_find(context);
struct ast_context *con = ast_context_find(context);
if (con) {
struct ast_ignorepat *pat;
for (pat = con->ignorepats; pat; pat = pat->next) {
if (ast_extension_match(pat->pattern, pattern))
return 1;
}
}
return 0;
}
@ -4011,8 +4010,7 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex
ast_channel_lock(chan);
if (chan->pbx) {
/* This channel is currently in the PBX */
if (chan->pbx) { /* This channel is currently in the PBX */
ast_explicit_goto(chan, context, exten, priority);
ast_softhangup_nolock(chan, AST_SOFTHANGUP_ASYNCGOTO);
} else {

Loading…
Cancel
Save