diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:34:45 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:34:45 +0000 |
commit | c907295f9a8f33a682d9ce57136df4116b43d888 (patch) | |
tree | 0f848066fd29b8c9ccbe1ce9cb6c07f214f8fd89 /pbx | |
parent | d28dafe2a434e6d06c9f7ca53873ff7e8b12f975 (diff) |
Merged revisions 209760-209761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines
Merged revisions 209759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines
Minor changes inspired by testing with latest GCC.
The latest GCC (what will become 4.5.x) has a few new warnings, that in these
cases found some either downright buggy code, or at least seriously poorly
designed code that could be improved.
........
................
r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line
Revert accidental Makefile change.
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209816 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/pbx_config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 093d77129..7f07549a6 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1441,7 +1441,7 @@ static int pbx_load_config(const char *config_file) goto process_extension; } } else if (!strcasecmp(v->name, "exten")) { - int ipri = -2; + int ipri; char *plus, *firstp; char *pri, *appl, *data, *cidmatch; @@ -1453,6 +1453,7 @@ static int pbx_load_config(const char *config_file) pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1); ast_copy_string(lastextension, realext, sizeof(lastextension)); process_extension: + ipri = -2; if ((cidmatch = strchr(realext, '/'))) { *cidmatch++ = '\0'; ast_shrink_phone_number(cidmatch); |