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: https://origsvn.digium.com/svn/asterisk/trunk@209760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-08-01 01:03:07 +00:00
parent 68a05b14c6
commit ed2a3cedd1
7 changed files with 8 additions and 7 deletions

View File

@@ -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);