kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tue Mar 4 07:00:01 CET 2003

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matteo Brancaleoni
2003-03-04 06:00:19 +00:00
parent 3f86070028
commit ce58e5862d
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pbx.c
View File

@@ -766,7 +766,6 @@ static void pbx_substitute_variables_helper(struct ast_channel *c,char *cp1,char
*cp2='\0'; *cp2='\0';
do { do {
char *start,*start2; char *start,*start2;
if (!(*wherearewe)) break;
if ((tmp=strstr(wherearewe,"${"))) { if ((tmp=strstr(wherearewe,"${"))) {
variables++; variables++;
length=(int)(tmp-wherearewe); length=(int)(tmp-wherearewe);
@@ -818,16 +817,15 @@ static void pbx_substitute_variables_helper(struct ast_channel *c,char *cp1,char
cp1=cp2; cp1=cp2;
} }
if (count) {
pbx_substitute_variables_temp(c,cp1,&cp4); pbx_substitute_variables_temp(c,cp1,&cp4);
if (cp4) { if (cp4) {
/* reset output variable so we could store the result */ /* reset output variable so we could store the result */
*cp2='\0'; *cp2='\0';
length=strlen(cp4); length=strlen(cp4);
strncat(cp2,cp4,length); strncat(cp2,cp4,length);
} else { } else
if (count) cp2[0]='\0'; cp2[0]='\0';
} }
break; 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 load_module(void)
{ {
int res; int res;
load_moh_classes(); load_moh_classes();
res = ast_register_application(app0, moh0_exec, synopsis0, descrip0); res = ast_register_application(app0, moh0_exec, synopsis0, descrip0);
atexit(ast_moh_destroy);
if (!res) if (!res)
res = ast_register_application(app1, moh1_exec, synopsis1, descrip1); res = ast_register_application(app1, moh1_exec, synopsis1, descrip1);
if (!res) if (!res)