diff options
| author | Corey Farrell <git@cfware.com> | 2016-07-14 14:51:42 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-07-15 05:34:29 -0400 |
| commit | be36bd7ca565531c09ca444e59b6d057131a9ab0 (patch) | |
| tree | 85595a26df4bbfcfc39a78c5c2474984c8c894ce /res/ael | |
| parent | 273052f40498378d3f2d3548347a243df68ee9a4 (diff) | |
pbx: Create pbx_include.c for management of 'struct ast_include'.
This changes context includes from a linked list to a vector, makes
'struct ast_include' opaque to pbx.c.
Although ast_walk_context_includes is maintained the procedure is no
longer efficient except for the first call (inc==NULL). This
functionality is replaced by two new functions implemented by vector
macros.
* ast_context_includes_count (AST_VECTOR_SIZE)
* ast_context_includes_get (AST_VECTOR_GET)
As with ast_walk_context_includes callers of these functions are
expected to have locked contexts. Only a few places in Asterisk walked
the includes, they have been converted to use the new functions.
const have been applied where possible to parameters for ast_include
functions.
Change-Id: Ib5c882e27cf96fb2aec67a39c18b4c71c9c83b60
Diffstat (limited to 'res/ael')
| -rw-r--r-- | res/ael/pval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/ael/pval.c b/res/ael/pval.c index ce9458c06..8b6760f99 100644 --- a/res/ael/pval.c +++ b/res/ael/pval.c @@ -4410,7 +4410,7 @@ static int context_used(struct ael_extension *exten_list, struct ast_context *co { struct ael_extension *exten; /* Check the simple elements first */ - if (ast_walk_context_extensions(context, NULL) || ast_walk_context_includes(context, NULL) || ast_walk_context_ignorepats(context, NULL) || ast_walk_context_switches(context, NULL)) { + if (ast_walk_context_extensions(context, NULL) || ast_context_includes_count(context) || ast_walk_context_ignorepats(context, NULL) || ast_walk_context_switches(context, NULL)) { return 1; } for (exten = exten_list; exten; exten = exten->next_exten) { |