aboutsummaryrefslogtreecommitdiffstats
path: root/pbx
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-01 01:03:07 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-01 01:03:07 +0000
commit7c81679557f8c92ebb8afd32548fe0092b32d342 (patch)
treeb2a0c47ec4376a446a2451c23df6b65c06c7eff6 /pbx
parent80248fe9520657bc87f9ebe2ddbd9ca2c8ddf93a (diff)
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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@209760 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r--pbx/pbx_config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index cb89fd7d4..990c4db97 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1440,7 +1440,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;
@@ -1452,6 +1452,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);