dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Tue Mar 4 07:00:01 CET 2003 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@631 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
matteo 2003-03-04 06:00:19 +00:00
parent ddf7eb7695
commit 91371ff934
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pbx.c
View File

@ -766,7 +766,6 @@ static void pbx_substitute_variables_helper(struct ast_channel *c,char *cp1,char
*cp2='\0';
do {
char *start,*start2;
if (!(*wherearewe)) break;
if ((tmp=strstr(wherearewe,"${"))) {
variables++;
length=(int)(tmp-wherearewe);
@ -818,16 +817,15 @@ static void pbx_substitute_variables_helper(struct ast_channel *c,char *cp1,char
cp1=cp2;
}
pbx_substitute_variables_temp(c,cp1,&cp4);
if (cp4) {
/* reset output variable so we could store the result */
*cp2='\0';
length=strlen(cp4);
strncat(cp2,cp4,length);
} else {
if (count) cp2[0]='\0';
if (count) {
pbx_substitute_variables_temp(c,cp1,&cp4);
if (cp4) {
/* reset output variable so we could store the result */
*cp2='\0';
length=strlen(cp4);
strncat(cp2,cp4,length);
} else
cp2[0]='\0';
}
break;
}

16
res/res_musiconhold.c
View File

@ -531,11 +531,27 @@ static void load_moh_classes(void)
}
}
void ast_moh_destroy(void)
{
struct mohclass *moh;
ast_pthread_mutex_lock(&moh_lock);
moh = mohclasses;
while(moh) {
if (moh->pid) {
kill(moh->pid, SIGKILL);
moh->pid = 0;
}
moh = moh->next;
}
ast_pthread_mutex_unlock(&moh_lock);
}
int load_module(void)
{
int res;
load_moh_classes();
res = ast_register_application(app0, moh0_exec, synopsis0, descrip0);
atexit(ast_moh_destroy);
if (!res)
res = ast_register_application(app1, moh1_exec, synopsis1, descrip1);
if (!res)