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

more small simplifications 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo 2006-05-09 06:04:45 +00:00
parent 3890d4e813
commit 8d12c56f16
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pbx.c
View File

@ -4183,15 +4183,16 @@ int ast_add_extension2(struct ast_context *con,
tmp->registrar = registrar;
ast_mutex_lock(&con->lock);
for (e = con->root; e; e = e->next) {
/* Make sure patterns are always last! */
if ((e->exten[0] != '_') && (extension[0] == '_'))
for (e = con->root; e; el = e, e = e->next) { /* scan the extension list */
/* XXX should use ext_cmp() to sort patterns correctly */
/* almost strcmp, but make sure patterns are always last! */
if (e->exten[0] != '_' && extension[0] == '_')
res = -1;
else if ((e->exten[0] == '_') && (extension[0] != '_'))
else if (e->exten[0] == '_' && extension[0] != '_')
res = 1;
else
res= strcmp(e->exten, extension);
if (!res) {
if (res == 0) { /* extension match, now look at cidmatch */
if (!e->matchcid && !tmp->matchcid)
res = 0;
else if (tmp->matchcid && !e->matchcid)