diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-05-13 22:29:39 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-05-13 22:29:39 +0000 |
| commit | 1642b09aba30d6f0b95a11bf079f99db94fdac02 (patch) | |
| tree | 64c5de0a1afb1872ee474057eb3f244015f2801c /pbx | |
| parent | 1c5b980de51d4caaa1d463fd0f702305b87aec4e (diff) | |
Version 0.1.12 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@446 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rwxr-xr-x | pbx/pbx_config.c | 8 | ||||
| -rwxr-xr-x | pbx/pbx_gtkconsole.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index fc5bc2586..38c6e1f39 100755 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -31,7 +31,7 @@ static char *registrar = "pbx_config"; static int static_config = 0; static int write_protect_config = 1; -static pthread_mutex_t save_dialplan_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t save_dialplan_lock = AST_MUTEX_INITIALIZER; /* * Help for commands provided by this module ... @@ -1496,8 +1496,12 @@ static int pbx_load_module(void) appl=""; data = strtok(NULL, ","); + cidmatch = strchr(ext, '/'); + if (cidmatch) { + *cidmatch = '\0'; + cidmatch++; + } strtok(ext, "/"); - cidmatch = strtok(NULL, "/"); if (!data) data=""; diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index 5d3f05773..d93ef6fa9 100755 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -40,7 +40,7 @@ /* For where to put dynamic tables */ #include "../asterisk.h" -static pthread_mutex_t verb_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t verb_lock = AST_MUTEX_INITIALIZER; static pthread_t console_thread; |