sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pbx.c didn't get updated 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Martin Pycko 2003-07-14 17:17:05 +00:00
parent f4341a13d0
commit 1521e09083
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pbx.c
View File

@ -2741,14 +2741,22 @@ struct ast_context *ast_context_create(struct ast_context **extcontexts, char *n
void __ast_context_destroy(struct ast_context *con, char *registrar, int lock);
void ast_merge_contexts_and_delete(struct ast_context **extcontexts) {
void ast_merge_contexts_and_delete(struct ast_context **extcontexts, char *registrar) {
struct ast_context *tmp, *lasttmp = NULL;
tmp = *extcontexts;
ast_pthread_mutex_lock(&conlock);
while (tmp) {
__ast_context_destroy(tmp,tmp->registrar,0);
lasttmp = tmp;
tmp = tmp->next;
if (registrar) {
__ast_context_destroy(NULL,registrar,0);
while (tmp) {
lasttmp = tmp;
tmp = tmp->next;
}
} else {
while (tmp) {
__ast_context_destroy(tmp,tmp->registrar,0);
lasttmp = tmp;
tmp = tmp->next;
}
}
if (lasttmp) {
lasttmp->next = contexts;