sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be less picky about spaces, and recognize invalid priorities 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2003-11-23 22:40:37 +00:00
parent e0544c3eb5
commit 143b3de606
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pbx/pbx_config.c
View File

@ -1116,10 +1116,13 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
}
prior = strsep(&whole_exten,",");
if (prior) {
if (!strcmp(prior, "hint")) {
if (!strcmp(prior, "hint")) {
iprior = PRIORITY_HINT;
} else {
iprior = atoi(prior);
if (scanf(prior, "%i", &iprior) != 1) {
ast_cli(fd, "'%s' is not a valid priority\n", prior);
prior = NULL;
}
}
}
app = strsep(&whole_exten,",");
@ -1579,8 +1582,12 @@ static int pbx_load_module(void)
pri="";
if (!strcmp(pri,"hint"))
ipri=PRIORITY_HINT;
else
ipri=atoi(pri);
else {
if (sscanf(pri, "%i", &ipri) != 1) {
ast_log(LOG_WARNING, "Invalid priority '%s' at line %d\n", pri, v->lineno);
ipri = 0;
}
}
appl = stringp;
if (!appl)
appl="";
@ -1617,8 +1624,10 @@ static int pbx_load_module(void)
if (!data)
data="";
pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
if (ast_add_extension2(con, 0, realext, ipri, cidmatch, appl, strdup(data), FREE, registrar)) {
ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno);
if (ipri) {
if (ast_add_extension2(con, 0, realext, ipri, cidmatch, appl, strdup(data), FREE, registrar)) {
ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno);
}
}
free(tc);
} else fprintf(stderr,"Error strdup returned NULL in %s\n",__PRETTY_FUNCTION__);