kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge "config: Speed up config template lookup" into 13

Browse Source
This commit is contained in:
Jenkins2
2017-12-04 08:52:45 -06:00
committed by Gerrit Code Review
parent 9e9dccd293 6635ddc819
commit 7e4bd0cf69
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/config.c
+9 -7
View File
@@ -988,13 +988,15 @@ struct ast_category *ast_category_new_template(const char *name, const char *in_
}
static struct ast_category *category_get_sep(const struct ast_config *config,
const char *category_name, const char *filter, char sep)
const char *category_name, const char *filter, char sep, char pointer_match_possible)
{
struct ast_category *cat;
for (cat = config->root; cat; cat = cat->next) {
if (cat->name == category_name && does_category_match(cat, category_name, filter, sep)) {
return cat;
if (pointer_match_possible) {
for (cat = config->root; cat; cat = cat->next) {
if (cat->name == category_name && does_category_match(cat, category_name, filter, sep)) {
return cat;
}
}
}
@@ -1010,7 +1012,7 @@ static struct ast_category *category_get_sep(const struct ast_config *config,
struct ast_category *ast_category_get(const struct ast_config *config,
const char *category_name, const char *filter)
{
return category_get_sep(config, category_name, filter, ',');
return category_get_sep(config, category_name, filter, ',', 1);
}
const char *ast_category_get_name(const struct ast_category *category)
@@ -1794,7 +1796,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
if (cur[1] != ',') {
filter = &cur[1];
}
*cat = category_get_sep(cfg, catname, filter, '&');
*cat = category_get_sep(cfg, catname, filter, '&', 0);
if (!(*cat)) {
if (newcat) {
ast_category_destroy(newcat);
@@ -1812,7 +1814,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
} else {
struct ast_category *base;
base = ast_category_get(cfg, cur, "TEMPLATES=include");
base = category_get_sep(cfg, cur, "TEMPLATES=include", ',', 0);
if (!base) {
if (newcat) {
ast_category_destroy(newcat);