mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-03 19:16:46 +00:00
simplify the loop that iterates through the categories in followme.conf and
don't try to read the general section as a followme profile git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -279,7 +279,7 @@ static int reload_followme(void)
|
|||||||
{
|
{
|
||||||
struct ast_call_followme *f;
|
struct ast_call_followme *f;
|
||||||
struct ast_config *cfg;
|
struct ast_config *cfg;
|
||||||
char *cat, *tmp;
|
char *cat = NULL, *tmp;
|
||||||
struct ast_variable *var;
|
struct ast_variable *var;
|
||||||
struct number *cur, *nm;
|
struct number *cur, *nm;
|
||||||
int new, idx;
|
int new, idx;
|
||||||
@@ -346,8 +346,9 @@ static int reload_followme(void)
|
|||||||
ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
|
ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
|
||||||
|
|
||||||
/* Chug through config file */
|
/* Chug through config file */
|
||||||
cat = ast_category_browse(cfg, NULL);
|
while ((cat = ast_category_browse(cfg, cat))) {
|
||||||
while(cat) {
|
if (!strcasecmp(cat, "general"))
|
||||||
|
continue;
|
||||||
/* Define a new profile */
|
/* Define a new profile */
|
||||||
/* Look for an existing one */
|
/* Look for an existing one */
|
||||||
AST_LIST_TRAVERSE(&followmes, f, entry) {
|
AST_LIST_TRAVERSE(&followmes, f, entry) {
|
||||||
@@ -416,7 +417,6 @@ static int reload_followme(void)
|
|||||||
AST_LIST_INSERT_HEAD(&followmes, f, entry);
|
AST_LIST_INSERT_HEAD(&followmes, f, entry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cat = ast_category_browse(cfg, cat);
|
|
||||||
}
|
}
|
||||||
ast_config_destroy(cfg);
|
ast_config_destroy(cfg);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user